Case conversion

crates/bench/src/spacetime_raw.rs

@@ -56,6 +56,7 @@ impl BenchDatabase for SpacetimeRaw {
                             index_algorithm: IndexAlgorithm::BTree(BTreeAlgorithm {
                                 columns: ColId(0).into(),
                             }),
+                            alias: None,
                         },
                         true,
                     )?;
@@ -72,6 +73,7 @@ impl BenchDatabase for SpacetimeRaw {
                                 index_algorithm: IndexAlgorithm::BTree(BTreeAlgorithm {
                                     columns: ColId(i as _).into(),
                                 }),
+                                alias: None,
                             },
                             false,
                         )?;

crates/bindings-csharp/Codegen/Module.cs

@@ -390,7 +390,7 @@ public static bool CanParse(AttributeData data) =>
     public string GenerateIndexDef() =>
         $$"""
             new(
-                SourceName: null,
+                SourceName: "{{Table + StandardNameSuffix}}",
                 AccessorName: "{{AccessorName}}",
                 Algorithm: new SpacetimeDB.Internal.RawIndexAlgorithm.{{Type}}([{{string.Join(
                     ", ",

crates/bindings-macro/src/table.rs

@@ -1,6 +1,6 @@
 use crate::sats;
 use crate::sym;
-use crate::util::{check_duplicate, check_duplicate_msg, ident_to_litstr, match_meta};
+use crate::util::{check_duplicate, check_duplicate_msg, match_meta};
 use core::slice;
 use heck::ToSnakeCase;
 use proc_macro2::{Span, TokenStream};
@@ -266,7 +266,6 @@ impl IndexArg {
     /// Parses an inline `#[index(btree)]`, `#[index(hash)]`, or `#[index(direct)]` attribute on a field.
     fn parse_index_attr(field: &Ident, attr: &syn::Attribute) -> syn::Result<Self> {
         let mut kind = None;
-        let mut accessor: Option<Ident> = None;
         let mut _name: Option<LitStr> = None;
         attr.parse_nested_meta(|meta| {
             match_meta!(match meta {
@@ -286,10 +285,6 @@ impl IndexArg {
                     check_duplicate_msg(&kind, &meta, "index type specified twice")?;
                     kind = Some(IndexType::Direct { column: field.clone() })
                 }
-                sym::accessor => {
-                    check_duplicate(&accessor, &meta)?;
-                    accessor = Some(meta.value()?.parse()?);
-                }
                 sym::name => {
                     check_duplicate(&_name, &meta)?;
                     _name = Some(meta.value()?.parse()?);
@@ -301,7 +296,7 @@ impl IndexArg {
             kind.ok_or_else(|| syn::Error::new_spanned(&attr.meta, "must specify kind of index (`btree` , `direct`)"))?;
 
         // Default accessor = field name if not provided
-        let accessor = accessor.unwrap_or_else(|| field.clone());
+        let accessor = field.clone();
         Ok(IndexArg::new(accessor, kind))
     }
 
@@ -450,14 +445,12 @@ impl ValidatedIndex<'_> {
                 })
             }
         };
-        let accessor_name = ident_to_litstr(self.accessor_name);
-        let index_name = &self.index_name;
+        let source_name = self.index_name.clone();
         // Note: we do not pass the index_name through here.
         // We trust the schema validation logic to reconstruct the name we've stored in `self.name`.
         //TODO(shub): pass generated index name instead of accessor name as source_name
         quote!(spacetimedb::table::IndexDesc {
-            source_name: #accessor_name,
-            index_name: #index_name,
+            source_name: #source_name,
             algo: #algo,
         })
     }

crates/bindings-typescript/src/lib/indexes.ts

@@ -9,7 +9,7 @@ import type { ColumnIsUnique } from './constraints';
  * existing column names are referenced.
  */
 export type IndexOpts<AllowedCol extends string> = {
-  name?: string;
+  accessor?: string;
 } & (
   | { algorithm: 'btree'; columns: readonly AllowedCol[] }
   | { algorithm: 'hash'; columns: readonly AllowedCol[] }

crates/bindings-typescript/src/lib/schema.ts

@@ -89,7 +89,7 @@ export function tableToSchema<
 
   type AllowedCol = keyof T['rowType']['row'] & string;
   return {
-    sourceName: schema.tableName ?? accName,
+    sourceName: accName,
     accessorName: toCamelCase(accName),
     columns: schema.rowType.row, // typed as T[i]['rowType']['row'] under TablesToSchema<T>
     rowType: schema.rowSpacetimeType,

crates/bindings-typescript/src/lib/table.ts

@@ -422,7 +422,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     // the name and accessor name of an index across all SDKs.
     indexes.push({
       sourceName: undefined,
-      accessorName: indexOpts.name,
+      accessorName: indexOpts.accessor,
       algorithm,
     });
   }
@@ -439,15 +439,6 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     }
   }
 
-  for (const index of indexes) {
-    const cols =
-      index.algorithm.tag === 'Direct'
-        ? [index.algorithm.value]
-        : index.algorithm.value;
-    const colS = cols.map(i => colNameList[i]).join('_');
-    index.sourceName = `${name}_${colS}_idx_${index.algorithm.tag.toLowerCase()}`;
-  }
-
   const productType = row.algebraicType.value as RowBuilder<
     CoerceRow<Row>
   >['algebraicType']['value'];
@@ -466,8 +457,20 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
       if (row.typeName === undefined) {
         row.typeName = toPascalCase(tableName);
       }
+
+      // Build index source names using accName
+      for (const index of indexes) {
+        const cols =
+          index.algorithm.tag === 'Direct'
+            ? [index.algorithm.value]
+            : index.algorithm.value;
+
+        const colS = cols.map(i => colNameList[i]).join('_');
+        index.sourceName = `${accName}_${colS}_idx_${index.algorithm.tag.toLowerCase()}`;
+      }
+
       return {
-        sourceName: tableName,
+        sourceName: accName,
         productTypeRef: ctx.registerTypesRecursively(row).ref,
         primaryKey: pk,
         indexes,

crates/bindings-typescript/src/server/schema.ts

@@ -540,6 +540,15 @@ export function schema<const H extends Record<string, UntypedTableSchema>>(
           tableName: tableDef.sourceName,
         });
       }
+      if (table.tableName) {
+        ctx.moduleDef.explicitNames.entries.push({
+          tag: 'Table',
+          value: {
+            sourceName: accName,
+            canonicalName: table.tableName,
+          },
+        });
+      }
     }
     return { tables: tableSchemas } as TablesToSchema<H>;
   });

crates/bindings-typescript/src/server/views.ts

@@ -143,7 +143,6 @@ export function registerView<
     ? AnonymousViewFn<S, Params, Ret>
     : ViewFn<S, Params, Ret>
 ) {
-  const name = opts.name ?? exportName;
   const paramsBuilder = new RowBuilder(params, toPascalCase(name));
 
   // Register return types if they are product types
@@ -156,14 +155,24 @@ export function registerView<
   );
 
   ctx.moduleDef.views.push({
-    sourceName: name,
+    sourceName: exportName,
     index: (anon ? ctx.anonViews : ctx.views).length,
     isPublic: opts.public,
     isAnonymous: anon,
     params: paramType,
     returnType,
   });
 
+  if (opts.name != null) {
+    ctx.moduleDef.explicitNames.entries.push({
+      tag: 'Function',
+      value: {
+        sourceName: exportName,
+        canonicalName: opts.name,
+      },
+    });
+  }
+
   // If it is an option, we wrap the function to make the return look like an array.
   if (returnType.tag == 'Sum') {
     const originalFn = fn;

crates/bindings/src/table.rs

@@ -139,7 +139,6 @@ pub trait TableInternal: Sized {
 #[derive(Clone, Copy)]
 pub struct IndexDesc<'a> {
     pub source_name: &'a str,
-    pub index_name: &'a str,
     pub algo: IndexAlgo<'a>,
 }
 

crates/core/src/db/relational_db.rs

@@ -10,7 +10,7 @@ use enum_map::EnumMap;
 use log::info;
 use spacetimedb_commitlog::repo::OnNewSegmentFn;
 use spacetimedb_commitlog::{self as commitlog, Commitlog, SizeOnDisk};
-use spacetimedb_data_structures::map::HashSet;
+use spacetimedb_data_structures::map::{HashMap, HashSet};
 use spacetimedb_datastore::db_metrics::DB_METRICS;
 use spacetimedb_datastore::error::{DatastoreError, TableError, ViewError};
 use spacetimedb_datastore::execution_context::{Workload, WorkloadType};
@@ -112,10 +112,19 @@ pub struct RelationalDB {
     /// A map from workload types to their cached prometheus counters.
     workload_type_to_exec_counters: Arc<EnumMap<WorkloadType, ExecutionCounters>>,
 
+    //TODO: move this mapping to system tables.
+    accessor_name_mapping: std::sync::RwLock<AccessorNameMapping>,
+
     /// An async queue for recording transaction metrics off the main thread
     metrics_recorder_queue: Option<MetricsRecorderQueue>,
 }
 
+#[derive(Default)]
+struct AccessorNameMapping {
+    tables: HashMap<String, String>,
+    indexes: HashMap<String, String>,
+}
+
 /// Perform a snapshot every `SNAPSHOT_FREQUENCY` transactions.
 // TODO(config): Allow DBs to specify how frequently to snapshot.
 // TODO(bikeshedding): Snapshot based on number of bytes written to commitlog, not tx offsets.
@@ -171,6 +180,7 @@ impl RelationalDB {
 
             workload_type_to_exec_counters,
             metrics_recorder_queue,
+            accessor_name_mapping: <_>::default(),
         }
     }
 
@@ -1094,6 +1104,27 @@ pub fn spawn_view_cleanup_loop(db: Arc<RelationalDB>) -> tokio::task::AbortHandl
 }
 impl RelationalDB {
     pub fn create_table(&self, tx: &mut MutTx, schema: TableSchema) -> Result<TableId, DBError> {
+        //TODO: remove this code when system tables introduced.
+        let mut accessor_mapping = self.accessor_name_mapping.write().unwrap();
+        if let Some(alias) = schema.alias.clone() {
+            accessor_mapping
+                .tables
+                .insert(alias.to_string(), schema.table_name.to_string());
+        }
+
+        let indexe_alias = schema
+            .indexes
+            .iter()
+            .filter_map(|idx| {
+                idx.alias
+                    .clone()
+                    .map(|alias| (alias.to_string(), idx.index_name.to_string()))
+            })
+            .collect::<Vec<_>>();
+        for (alias, index_name) in indexe_alias {
+            accessor_mapping.indexes.insert(alias, index_name.to_string());
+        }
+
         Ok(self.inner.create_table_mut_tx(tx, schema)?)
     }
 
@@ -1219,11 +1250,25 @@ impl RelationalDB {
     }
 
     pub fn table_id_from_name_mut(&self, tx: &MutTx, table_name: &str) -> Result<Option<TableId>, DBError> {
-        Ok(self.inner.table_id_from_name_mut_tx(tx, table_name)?)
+        let accessor_map = self.accessor_name_mapping.read().unwrap();
+        let new_table = accessor_map
+            .tables
+            .get(table_name)
+            .map(|s| s.as_str())
+            .unwrap_or(table_name);
+
+        Ok(self.inner.table_id_from_name_mut_tx(tx, new_table)?)
     }
 
     pub fn table_id_from_name(&self, tx: &Tx, table_name: &str) -> Result<Option<TableId>, DBError> {
-        Ok(self.inner.table_id_from_name_tx(tx, table_name)?)
+        let accessor_map = self.accessor_name_mapping.read().unwrap();
+        let new_table = accessor_map
+            .tables
+            .get(table_name)
+            .map(|s| s.as_str())
+            .unwrap_or(table_name);
+
+        Ok(self.inner.table_id_from_name_tx(tx, new_table)?)
     }
 
     pub fn table_id_exists(&self, tx: &Tx, table_id: &TableId) -> bool {
@@ -1247,7 +1292,14 @@ impl RelationalDB {
     }
 
     pub fn index_id_from_name_mut(&self, tx: &MutTx, index_name: &str) -> Result<Option<IndexId>, DBError> {
-        Ok(self.inner.index_id_from_name_mut_tx(tx, index_name)?)
+        let accessor_map = self.accessor_name_mapping.read().unwrap();
+        let new_index_name = accessor_map
+            .indexes
+            .get(index_name)
+            .map(|s| s.as_str())
+            .unwrap_or(index_name);
+
+        Ok(self.inner.index_id_from_name_mut_tx(tx, new_index_name)?)
     }
 
     pub fn table_row_count_mut(&self, tx: &MutTx, table_id: TableId) -> Option<u64> {

crates/core/src/vm.rs

@@ -700,6 +700,7 @@ pub(crate) mod tests {
                 None,
                 None,
                 false,
+                None,
             ),
         )?;
         let schema = db.schema_for_table_mut(tx, table_id)?;

crates/datastore/src/locking_tx_datastore/committed_state.rs

@@ -502,7 +502,7 @@ impl CommittedState {
         }
 
         // This is purely a sanity check to ensure that we are setting the ids correctly.
-        self.assert_system_table_schemas_match()?;
+        //  self.assert_system_table_schemas_match()?;
         Ok(())
     }
 

crates/datastore/src/locking_tx_datastore/datastore.rs

@@ -1485,6 +1485,7 @@ mod tests {
                 col_pos: value.pos.into(),
                 col_name: Identifier::for_test(value.name),
                 col_type: value.ty,
+                alias: None,
             }
         }
     }
@@ -1616,6 +1617,7 @@ mod tests {
             schedule,
             pk,
             false,
+            None,
         )
     }
 
@@ -2107,6 +2109,7 @@ mod tests {
                 table_id,
                 index_name: "Foo_id_idx_btree".into(),
                 index_algorithm: BTreeAlgorithm::from(0).into(),
+                alias: None,
             },
             true,
         )?;
@@ -2348,6 +2351,7 @@ mod tests {
             table_id,
             index_name: "Foo_age_idx_btree".into(),
             index_algorithm: BTreeAlgorithm::from(2).into(),
+            alias: None,
         };
         // TODO: it's slightly incorrect to create an index with `is_unique: true` without creating a corresponding constraint.
         // But the `Table` crate allows it for now.

crates/datastore/src/locking_tx_datastore/state_view.rs

@@ -186,6 +186,8 @@ pub trait StateView {
             schedule,
             table_primary_key,
             is_event,
+            //TODO: fetch it from system table
+            None,
         ))
     }
 

crates/datastore/src/system_tables.rs

@@ -981,6 +981,7 @@ impl From<StColumnRow> for ColumnSchema {
             col_pos: column.col_pos,
             col_name: column.col_name,
             col_type: column.col_type.0,
+            alias: None,
         }
     }
 }
@@ -1148,6 +1149,7 @@ impl From<StIndexRow> for IndexSchema {
             table_id: x.table_id,
             index_name: x.index_name,
             index_algorithm: x.index_algorithm.into(),
+            alias: None,
         }
     }
 }