Add rust sdk tests exercising on_update for views

Author: joshua-spacetime

Cargo.lock

@@ -50,12 +50,14 @@ members = [
   "modules/sdk-test-connect-disconnect",
   "modules/sdk-test-procedure",
   "modules/sdk-test-view",
+  "modules/sdk-test-view-pk",
   "modules/sdk-test-event-table",
   "sdks/rust/tests/test-client",
   "sdks/rust/tests/test-counter",
   "sdks/rust/tests/connect_disconnect_client",
   "sdks/rust/tests/procedure-client",
   "sdks/rust/tests/view-client",
+  "sdks/rust/tests/view-pk-client",
   "sdks/rust/tests/event-table-client",
   "tools/ci",
   "tools/upgrade-version",

Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "sdk-test-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-view-pk/Cargo.toml

@@ -0,0 +1,69 @@
+use spacetimedb::{reducer, table, view, Query, ReducerContext, Table, ViewContext};
+
+#[table(accessor = view_pk_player, public)]
+pub struct ViewPkPlayer {
+    #[primary_key]
+    pub id: u64,
+    pub name: String,
+}
+
+#[table(accessor = view_pk_membership, public)]
+pub struct ViewPkMembership {
+    #[primary_key]
+    pub id: u64,
+    #[index(btree)]
+    pub player_id: u64,
+}
+
+#[table(accessor = view_pk_membership_secondary, public)]
+pub struct ViewPkMembershipSecondary {
+    #[primary_key]
+    pub id: u64,
+    #[index(btree)]
+    pub player_id: u64,
+}
+
+#[reducer]
+pub fn insert_view_pk_player(ctx: &ReducerContext, id: u64, name: String) {
+    ctx.db.view_pk_player().insert(ViewPkPlayer { id, name });
+}
+
+#[reducer]
+pub fn update_view_pk_player(ctx: &ReducerContext, id: u64, name: String) {
+    ctx.db.view_pk_player().id().update(ViewPkPlayer { id, name });
+}
+
+#[reducer]
+pub fn insert_view_pk_membership(ctx: &ReducerContext, id: u64, player_id: u64) {
+    ctx.db.view_pk_membership().insert(ViewPkMembership { id, player_id });
+}
+
+#[reducer]
+pub fn insert_view_pk_membership_secondary(ctx: &ReducerContext, id: u64, player_id: u64) {
+    ctx.db
+        .view_pk_membership_secondary()
+        .insert(ViewPkMembershipSecondary { id, player_id });
+}
+
+#[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 = sender_view_pk_players_a, public)]
+pub fn sender_view_pk_players_a(ctx: &ViewContext) -> impl Query<ViewPkPlayer> {
+    ctx.from
+        .view_pk_membership()
+        .right_semijoin(ctx.from.view_pk_player(), |membership, player| {
+            membership.player_id.eq(player.id)
+        })
+}
+
+#[view(accessor = sender_view_pk_players_b, public)]
+pub fn sender_view_pk_players_b(ctx: &ViewContext) -> impl Query<ViewPkPlayer> {
+    ctx.from
+        .view_pk_membership_secondary()
+        .right_semijoin(ctx.from.view_pk_player(), |membership, player| {
+            membership.player_id.eq(player.id)
+        })
+}

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

@@ -1,5 +1,5 @@
 use spacetimedb::{
-    reducer, table, view, AnonymousViewContext, Identity, ReducerContext, SpacetimeType, Table, ViewContext,
+    reducer, table, view, AnonymousViewContext, Identity, Query, ReducerContext, SpacetimeType, Table, ViewContext,
 };
 
 #[table(accessor = player, public)]
@@ -36,6 +36,41 @@ struct PlayerAndLevel {
     level: u64,
 }
 
+#[table(accessor = view_pk_player, public)]
+pub struct ViewPkPlayer {
+    #[primary_key]
+    pub id: u64,
+    pub name: String,
+}
+
+#[table(accessor = view_pk_membership, public)]
+pub struct ViewPkMembership {
+    #[primary_key]
+    pub id: u64,
+    #[index(btree)]
+    pub player_id: u64,
+}
+
+#[reducer]
+pub fn insert_view_pk_player(ctx: &ReducerContext, id: u64, name: String) {
+    ctx.db.view_pk_player().insert(ViewPkPlayer { id, name });
+}
+
+#[reducer]
+pub fn update_view_pk_player(ctx: &ReducerContext, id: u64, name: String) {
+    ctx.db.view_pk_player().id().update(ViewPkPlayer { id, name });
+}
+
+#[reducer]
+pub fn insert_view_pk_membership(ctx: &ReducerContext, id: u64, player_id: u64) {
+    ctx.db.view_pk_membership().insert(ViewPkMembership { id, player_id });
+}
+
+#[view(accessor = all_view_pk_players, public)]
+pub fn all_view_pk_players(ctx: &ViewContext) -> impl Query<ViewPkPlayer> {
+    ctx.from.view_pk_player()
+}
+
 #[reducer]
 fn insert_player(ctx: &ReducerContext, identity: Identity, level: u64) {
     let Player { entity_id, .. } = ctx.db.player().insert(Player { entity_id: 0, identity });

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

@@ -488,3 +488,43 @@ macro_rules! view_tests {
 
 view_tests!(rust_view, "");
 view_tests!(cpp_view, "-cpp");
+
+macro_rules! view_pk_tests {
+    ($mod_name:ident, $suffix:literal) => {
+        mod $mod_name {
+            use spacetimedb_testing::sdk::Test;
+
+            const MODULE: &str = concat!("sdk-test-view-pk", $suffix);
+            const CLIENT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/view-pk-client");
+
+            fn make_test(subcommand: &str) -> Test {
+                Test::builder()
+                    .with_name(subcommand)
+                    .with_module(MODULE)
+                    .with_client(CLIENT)
+                    .with_language("rust")
+                    .with_bindings_dir("src/module_bindings")
+                    .with_compile_command("cargo build")
+                    .with_run_command(format!("cargo run -- {}", subcommand))
+                    .build()
+            }
+
+            #[test]
+            fn query_builder_view_with_pk_on_update_callback() {
+                make_test("view-pk-on-update").run()
+            }
+
+            #[test]
+            fn query_builder_join_table_with_view_pk() {
+                make_test("view-pk-join-query-builder").run()
+            }
+
+            #[test]
+            fn query_builder_semijoin_two_sender_views_with_pk() {
+                make_test("view-pk-semijoin-two-sender-views-query-builder").run()
+            }
+        }
+    };
+}
+
+view_pk_tests!(rust_view_pk, "");

sdks/rust/tests/test.rs

@@ -0,0 +1,14 @@
+[package]
+name = "view-pk-client"
+version.workspace = true
+edition.workspace = true
+license-file = "LICENSE"
+
+[dependencies]
+spacetimedb-sdk = { path = "../.." }
+test-counter = { path = "../test-counter" }
+anyhow.workspace = true
+env_logger.workspace = true
+
+[lints]
+workspace = true

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

@@ -0,0 +1 @@
+../../../../licenses/BSL.txt

sdks/rust/tests/view-pk-client/LICENSE

@@ -0,0 +1,10 @@
+This test client is used with the module:
+
+- [`sdk-test-view-pk`](/modules/sdk-test-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-view-pk
+```