update tests

Author: joshua-spacetime

Cargo.lock

@@ -50,6 +50,7 @@ members = [
   "modules/sdk-test-view",
   "modules/sdk-test-case-conversion",
   "modules/sdk-test-view-pk",
+  "modules/sdk-test-procedural-view-pk",
   "modules/sdk-test-event-table",
   "sdks/rust/tests/test-client",
   "sdks/rust/tests/test-counter",
@@ -58,6 +59,7 @@ members = [
   "sdks/rust/tests/view-client",
   "sdks/rust/tests/case-conversion-client",
   "sdks/rust/tests/view-pk-client",
+  "sdks/rust/tests/procedural-view-pk-client",
   "sdks/rust/tests/event-table-client",
   "tools/ci",
   "tools/upgrade-version",

Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "sdk-test-procedural-view-pk"
+version = "0.1.0"
+edition.workspace = true
+license-file = "LICENSE"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+spacetimedb.workspace = true
+
+[lints]
+workspace = true

modules/sdk-test-procedural-view-pk/Cargo.toml

@@ -0,0 +1,56 @@
+use spacetimedb::{reducer, table, view, Identity, ReducerContext, Table, ViewContext};
+
+#[table(accessor = left_source, public)]
+pub struct LeftSource {
+    #[primary_key]
+    pub id: u64,
+    #[index(btree)]
+    pub sender: Identity,
+    pub filter: u64,
+}
+
+#[table(accessor = right_source, public)]
+pub struct RightSource {
+    #[primary_key]
+    pub id: u64,
+    #[index(btree)]
+    pub sender: Identity,
+    pub filter: u64,
+}
+
+#[reducer]
+pub fn insert_left(ctx: &ReducerContext, id: u64, filter: u64) {
+    ctx.db.left_source().insert(LeftSource {
+        id,
+        sender: ctx.sender(),
+        filter,
+    });
+}
+
+#[reducer]
+pub fn update_left(ctx: &ReducerContext, id: u64, filter: u64) {
+    ctx.db.left_source().id().update(LeftSource {
+        id,
+        sender: ctx.sender(),
+        filter,
+    });
+}
+
+#[reducer]
+pub fn insert_right(ctx: &ReducerContext, id: u64, filter: u64) {
+    ctx.db.right_source().insert(RightSource {
+        id,
+        sender: ctx.sender(),
+        filter,
+    });
+}
+
+#[view(accessor = sender_left_view, public, primary_key = id)]
+pub fn sender_left_view(ctx: &ViewContext) -> Vec<LeftSource> {
+    ctx.db.left_source().sender().filter(ctx.sender()).collect()
+}
+
+#[view(accessor = sender_right_view, public, primary_key = id)]
+pub fn sender_right_view(ctx: &ViewContext) -> Vec<RightSource> {
+    ctx.db.right_source().sender().filter(ctx.sender()).collect()
+}

modules/sdk-test-procedural-view-pk/src/lib.rs

@@ -1,4 +1,4 @@
-use spacetimedb::{reducer, table, view, Identity, Query, ReducerContext, SpacetimeType, Table, ViewContext};
+use spacetimedb::{reducer, table, view, Query, ReducerContext, Table, ViewContext};
 
 #[table(accessor = view_pk_player, public)]
 pub struct ViewPkPlayer {
@@ -23,31 +23,6 @@ pub struct ViewPkMembershipSecondary {
     pub player_id: u64,
 }
 
-#[derive(Clone, SpacetimeType)]
-pub struct ProceduralViewPkPlayer {
-    pub id: u64,
-    pub name: String,
-}
-
-#[table(accessor = procedural_view_pk_player_source, public)]
-pub struct ProceduralViewPkPlayerSource {
-    #[primary_key]
-    pub record_id: u64,
-    #[index(btree)]
-    pub id: u64,
-    pub name: String,
-}
-
-#[table(accessor = sender_procedural_view_pk_player_source, public)]
-pub struct SenderProceduralViewPkPlayerSource {
-    #[primary_key]
-    pub record_id: u64,
-    #[index(btree)]
-    pub owner: Identity,
-    pub id: u64,
-    pub name: String,
-}
-
 #[reducer]
 pub fn insert_view_pk_player(ctx: &ReducerContext, id: u64, name: String) {
     ctx.db.view_pk_player().insert(ViewPkPlayer { id, name });
@@ -70,78 +45,11 @@ pub fn insert_view_pk_membership_secondary(ctx: &ReducerContext, id: u64, player
         .insert(ViewPkMembershipSecondary { id, player_id });
 }
 
-#[reducer]
-pub fn insert_procedural_view_pk_player(ctx: &ReducerContext, record_id: u64, id: u64, name: String) {
-    ctx.db
-        .procedural_view_pk_player_source()
-        .insert(ProceduralViewPkPlayerSource { record_id, id, name });
-}
-
-#[reducer]
-pub fn update_procedural_view_pk_player(ctx: &ReducerContext, record_id: u64, id: u64, name: String) {
-    ctx.db
-        .procedural_view_pk_player_source()
-        .record_id()
-        .update(ProceduralViewPkPlayerSource { record_id, id, name });
-}
-
-#[reducer]
-pub fn insert_sender_procedural_view_pk_player(ctx: &ReducerContext, record_id: u64, id: u64, name: String) {
-    ctx.db
-        .sender_procedural_view_pk_player_source()
-        .insert(SenderProceduralViewPkPlayerSource {
-            record_id,
-            owner: ctx.sender(),
-            id,
-            name,
-        });
-}
-
-#[reducer]
-pub fn update_sender_procedural_view_pk_player(ctx: &ReducerContext, record_id: u64, id: u64, name: String) {
-    ctx.db
-        .sender_procedural_view_pk_player_source()
-        .record_id()
-        .update(SenderProceduralViewPkPlayerSource {
-            record_id,
-            owner: ctx.sender(),
-            id,
-            name,
-        });
-}
-
 #[view(accessor = all_view_pk_players, public)]
 pub fn all_view_pk_players(ctx: &ViewContext) -> impl Query<ViewPkPlayer> {
     ctx.from.view_pk_player()
 }
 
-#[view(accessor = all_procedural_view_pk_players, public, primary_key = id)]
-pub fn all_procedural_view_pk_players(ctx: &ViewContext) -> Vec<ProceduralViewPkPlayer> {
-    ctx.db
-        .procedural_view_pk_player_source()
-        .id()
-        .filter(0u64..)
-        .map(|row| ProceduralViewPkPlayer {
-            id: row.id,
-            name: row.name,
-        })
-        .collect()
-}
-
-#[view(accessor = sender_procedural_view_pk_players, public, primary_key = id)]
-pub fn sender_procedural_view_pk_players(ctx: &ViewContext) -> Vec<ProceduralViewPkPlayer> {
-    let sender = ctx.sender();
-    ctx.db
-        .sender_procedural_view_pk_player_source()
-        .owner()
-        .filter(sender)
-        .map(|row| ProceduralViewPkPlayer {
-            id: row.id,
-            name: row.name,
-        })
-        .collect()
-}
-
 #[view(accessor = sender_view_pk_players_a, public)]
 pub fn sender_view_pk_players_a(ctx: &ViewContext) -> impl Query<ViewPkPlayer> {
     ctx.from

modules/sdk-test-view-pk/src/lib.rs

@@ -0,0 +1,44 @@
+[package]
+name = "procedural-view-pk-client"
+version.workspace = true
+edition.workspace = true
+license-file = "LICENSE"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["native"]
+
+native = [
+    "dep:env_logger",
+    "dep:tokio",
+]
+
+browser = [
+    "spacetimedb-sdk/browser",
+    "dep:wasm-bindgen",
+    "dep:wasm-bindgen-futures",
+    "dep:console_error_panic_hook",
+    "dep:futures",
+]
+
+[[bin]]
+name = "procedural-view-pk-client"
+path = "src/main.rs"
+required-features = ["native"]
+
+[dependencies]
+spacetimedb-sdk = { path = "../.." }
+test-counter = { path = "../test-counter" }
+anyhow.workspace = true
+env_logger = { workspace = true, optional = true }
+tokio = { workspace = true, optional = true }
+futures = { workspace = true, optional = true }
+
+wasm-bindgen = { version = "0.2.100", optional = true }
+wasm-bindgen-futures = { version = "0.4.45", optional = true }
+console_error_panic_hook = { version = "0.1.7", optional = true }
+
+[lints]
+workspace = true

sdks/rust/tests/procedural-view-pk-client/Cargo.toml

@@ -0,0 +1,10 @@
+This test client is used with the Rust-only module:
+
+- [`sdk-test-procedural-view-pk`](/modules/sdk-test-procedural-view-pk)
+
+To (re-)generate the `module_bindings`, from this directory, run:
+
+```sh
+mkdir -p src/module_bindings
+spacetime generate --lang rust --out-dir src/module_bindings --module-path ../../../../modules/sdk-test-procedural-view-pk
+```

sdks/rust/tests/procedural-view-pk-client/README.md

@@ -0,0 +1,14 @@
+#![allow(clippy::disallowed_macros)]
+
+mod module_bindings;
+pub mod test_handlers;
+
+#[cfg(all(target_arch = "wasm32", feature = "browser"))]
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[cfg(all(target_arch = "wasm32", feature = "browser"))]
+#[wasm_bindgen]
+pub async fn run(test_name: String, db_name: String) {
+    console_error_panic_hook::set_once();
+    test_handlers::dispatch(&test_name, &db_name).await;
+}

sdks/rust/tests/procedural-view-pk-client/src/lib.rs

@@ -0,0 +1,23 @@
+use procedural_view_pk_client::test_handlers;
+
+fn exit_on_panic() {
+    let default_hook = std::panic::take_hook();
+    std::panic::set_hook(Box::new(move |panic_info| {
+        default_hook(panic_info);
+        std::process::exit(1);
+    }));
+}
+
+fn main() {
+    env_logger::init();
+    exit_on_panic();
+
+    let test = std::env::args()
+        .nth(1)
+        .expect("Pass a test name as a command-line argument to the test client");
+    let db_name = std::env::var("SPACETIME_SDK_TEST_DB_NAME").expect("Failed to read db name from env");
+
+    tokio::runtime::Runtime::new()
+        .unwrap()
+        .block_on(test_handlers::dispatch(&test, &db_name));
+}