Rip useless names out of RawDef

crates/bench/benches/subscription.rs

@@ -20,7 +20,7 @@ fn create_table_location(db: &RelationalDB) -> Result<TableId, DBError> {
         ("z", AlgebraicType::I32),
         ("dimension", AlgebraicType::U32),
     ];
-    let indexes = &[(0.into(), "entity_id"), (1.into(), "chunk_index")];
+    let indexes = &[0.into(), 1.into()];
 
     // Is necessary to test for both single & multi-column indexes...
     db.create_table_for_test_mix_indexes("location", schema, indexes, col_list![2, 3, 4])
@@ -33,7 +33,7 @@ fn create_table_footprint(db: &RelationalDB) -> Result<TableId, DBError> {
         ("owner_entity_id", AlgebraicType::U64),
         ("type", footprint),
     ];
-    let indexes = &[(0.into(), "entity_id"), (1.into(), "owner_entity_id")];
+    let indexes = &[0.into(), 1.into()];
     db.create_table_for_test("footprint", schema, indexes)
 }
 

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#BTreeViews.verified.cs

@@ -76,6 +76,12 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                             false,
                             SpacetimeDB.Internal.IndexType.BTree,
                             [3]
+                        ),
+                        new(
+                            "idx_BTreeViews_BTreeViews_Id_unique",
+                            true,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [0]
                         )
                     ],
                     Constraints:

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#MultiTableRow.verified.cs

@@ -60,7 +60,18 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                     ],
                     Indexes:
                     [
-                        new("bt_MultiTable1_Name", false, SpacetimeDB.Internal.IndexType.BTree, [0])
+                        new(
+                            "bt_MultiTable1_Name",
+                            false,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [0]
+                        ),
+                        new(
+                            "idx_MultiTable1_MultiTable1_Foo_unique",
+                            true,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [1]
+                        )
                     ],
                     Constraints:
                     [
@@ -91,7 +102,21 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                         new(nameof(Foo), BSATN.Foo.GetAlgebraicType(registrar)),
                         new(nameof(Bar), BSATN.Bar.GetAlgebraicType(registrar))
                     ],
-                    Indexes: [],
+                    Indexes:
+                    [
+                        new(
+                            "idx_MultiTable2_MultiTable2_Foo_unique",
+                            true,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [1]
+                        ),
+                        new(
+                            "idx_MultiTable2_MultiTable2_Bar_unique",
+                            true,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [2]
+                        )
+                    ],
                     Constraints:
                     [
                         new("MultiTable2_Foo", (byte)SpacetimeDB.Internal.ColumnAttrs.AutoInc, [1]),

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#PublicTable.verified.cs

@@ -214,7 +214,15 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                             BSATN.NullableReferenceField.GetAlgebraicType(registrar)
                         )
                     ],
-                    Indexes: [],
+                    Indexes:
+                    [
+                        new(
+                            "idx_PublicTable_PublicTable_Id_unique",
+                            true,
+                            SpacetimeDB.Internal.IndexType.BTree,
+                            [0]
+                        )
+                    ],
                     Constraints:
                     [
                         new(

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#Timers.SendMessageTimer.verified.cs

@@ -66,7 +66,15 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
                             new(nameof(ScheduledId), BSATN.ScheduledId.GetAlgebraicType(registrar)),
                             new(nameof(ScheduledAt), BSATN.ScheduledAt.GetAlgebraicType(registrar))
                         ],
-                        Indexes: [],
+                        Indexes:
+                        [
+                            new(
+                                "idx_SendMessageTimer_SendMessageTimer_ScheduledId_unique",
+                                true,
+                                SpacetimeDB.Internal.IndexType.BTree,
+                                [1]
+                            )
+                        ],
                         Constraints:
                         [
                             new(

crates/bindings-csharp/Codegen/Module.cs

@@ -169,8 +169,19 @@ public string GenerateIndexDef(string viewName, IEnumerable<ColumnDeclaration> c
         var cols = Columns.Select(c =>
             columns.Select((c, i) => (c, i)).First(cd => cd.c.Name == c).i
         );
+        // TODO: when updating to v9, you can just pass null for the name here (instead of "bt_...").
+        // The resulting index will have a name computed on the host, matching the output of StandardIndexName.
         return $"new(\"bt_{viewName}_{Name}\", false, SpacetimeDB.Internal.IndexType.{Type}, [{string.Join(", ", cols)}])";
     }
+
+    // See: bindings_sys::index_id_from_name for documentation of this format.
+    // Guaranteed not to contain quotes, so does not need to be escaped when embedded in a string.
+    // TODO: when updating to v9, this will be the name generated for indexes with no name set.
+    public static string StandardIndexName(
+        string type,
+        string tableName,
+        IEnumerable<string> columnNames
+    ) => $"index.{type.ToLower()}({tableName},[{string.Join(",", columnNames)}])";
 }
 
 record ViewBTree : ViewIndex
@@ -309,6 +320,7 @@ var ct in GetConstraints(viewName)
                 continue;
             }
 
+            // TODO: when updating to v9, use StandardIndexName instead of the "bt_" string here.
             yield return $$"""
                     {{vis}} sealed class {{btree.Name}}Index() : SpacetimeDB.Internal.IndexBase<{{globalName}}>("bt_{{viewName}}_{{btree.Name}}") {
                 """;
@@ -457,17 +469,24 @@ public override Scope.Extensions ToExtensions()
                         {{string.Join(",\n", Members.Select(m => m.GenerateColumnDef()))}}
                     ],
                     Indexes: [
-                        {{string.Join(",\n", BTrees
-                        .Where(b => b.Table == null || b.Table == v.Name)
-                        .Select(b => b.GenerateIndexDef(v.Name, Members)))}}
+                        {{string.Join(",\n", Enumerable.Concat(
+                        BTrees
+                            .Where(b => b.Table == null || b.Table == v.Name)
+                            .Select(b => b.GenerateIndexDef(v.Name, Members)),
+                        // We need to override the new auto-generated index names for unique constriants.
+                        // When we upgrade to v9, we can skip these, and just look up the indexes with StandardIndexName
+                        // for the relevant columns later.
+                        GetConstraints(v.Name)
+                            .Select(ct => $"new(\"idx_{v.Name}_{v.Name}_{ct.col.Name}_unique\", true, SpacetimeDB.Internal.IndexType.BTree, [{ct.pos}])")
+                        ))}}
                     ],
                     Constraints: [
                         {{string.Join(
                             ",\n",
                             GetConstraints(v.Name)
                             .Select(ct =>
                                 $$"""
-                                new (
+                                new(
                                     "{{v.Name}}_{{ct.col.Name}}",
                                     (byte)SpacetimeDB.Internal.ColumnAttrs.{{ct.attr}},
                                     [{{ct.pos}}]

crates/bindings-csharp/Runtime/README.md

@@ -14,3 +14,11 @@ While not really documented, it allows to build raw WebAssembly modules with cus
 - Finally, `bindings.c` implements no-op shims for all the WASI APIs so that they're linked internally and not attempted to be imported from the runtime itself.
 
 The result is a WebAssembly module FFI-compatible with SpacetimeDB and with no WASI imports, which is what we need.
+
+## Regenerating RawModuleDef
+To regenenerate the `Autogen` folder, run:
+
+```sh
+cd ../../cli
+cargo run --example regen-csharp-moduledef
+```