fix ViewId::SENTINEL

Author: joshua-spacetime

crates/datastore/src/error.rs

@@ -40,7 +40,7 @@ pub enum DatastoreError {
 #[derive(Error, Debug)]
 pub enum ViewError {
     #[error("view '{0}' not found")]
-    ViewNotFound(String),
+    NotFound(Box<str>),
     #[error("failed to deserialize view arguments from row")]
     DeserializeArgs,
     #[error("failed to deserialize view return value: {0}")]

crates/datastore/src/locking_tx_datastore/mut_tx.rs

@@ -8,13 +8,16 @@ use super::{
     tx_state::{IndexIdMap, PendingSchemaChange, TxState, TxTableForInsertion},
     SharedMutexGuard, SharedWriteGuard,
 };
-use crate::system_tables::{
-    system_tables, ConnectionIdViaU128, IdentityViaU256, StConnectionCredentialsFields, StConnectionCredentialsRow,
-    StViewArgFields, StViewArgRow, StViewColumnFields, StViewFields, StViewParamFields, StViewParamRow,
-    StViewSubFields, StViewSubRow, ST_CONNECTION_CREDENTIALS_ID, ST_VIEW_ARG_ID, ST_VIEW_COLUMN_ID, ST_VIEW_ID,
-    ST_VIEW_PARAM_ID, ST_VIEW_SUB_ID,
-};
 use crate::traits::{InsertFlags, RowTypeForTable, TxData, UpdateFlags};
+use crate::{
+    error::ViewError,
+    system_tables::{
+        system_tables, ConnectionIdViaU128, IdentityViaU256, StConnectionCredentialsFields, StConnectionCredentialsRow,
+        StViewArgFields, StViewArgRow, StViewColumnFields, StViewFields, StViewParamFields, StViewParamRow,
+        StViewSubFields, StViewSubRow, ST_CONNECTION_CREDENTIALS_ID, ST_VIEW_ARG_ID, ST_VIEW_COLUMN_ID, ST_VIEW_ID,
+        ST_VIEW_PARAM_ID, ST_VIEW_SUB_ID,
+    },
+};
 use crate::{
     error::{IndexError, SequenceError, TableError},
     system_tables::{
@@ -51,7 +54,7 @@ use spacetimedb_sats::{
     AlgebraicType, AlgebraicValue, ProductType, ProductValue, WithTypespace,
 };
 use spacetimedb_schema::{
-    def::{ModuleDef, ViewColumnDef, ViewDef},
+    def::{ModuleDef, ViewColumnDef, ViewDef, ViewParamDef},
     schema::{ColumnSchema, ConstraintSchema, IndexSchema, RowLevelSecuritySchema, SequenceSchema, TableSchema},
 };
 use spacetimedb_table::{
@@ -356,16 +359,21 @@ impl MutTxId {
 
         let ViewDef {
             name,
-            is_anonymous,
-            is_public,
-            params,
+            param_columns,
             return_columns,
             ..
         } = view_def;
 
-        let view_id = self.insert_into_st_view(name.clone().into(), table_id, *is_public, *is_anonymous)?;
-        self.insert_into_st_view_param(view_id, params)?;
+        let view_name: Box<str> = name.clone().into();
+
+        // `create_table` inserts into `st_view` and updates the table schema.
+        let view_id = self
+            .view_id_from_name(&view_name)?
+            .ok_or(ViewError::NotFound(view_name))?;
+
+        self.insert_into_st_view_param(view_id, param_columns)?;
         self.insert_into_st_view_column(view_id, return_columns)?;
+
         Ok((view_id, table_id))
     }
 
@@ -426,6 +434,10 @@ impl MutTxId {
 
         table_schema.update_table_id(table_id);
 
+        if let Some(info) = table_schema.view_info.as_mut() {
+            info.view_id = self.insert_into_st_view(table_name.clone(), table_id, true, info.is_anonymous)?;
+        }
+
         // Generate the full definition of the table, with the generated indexes, constraints, sequences...
 
         // Insert the columns into `st_column`.
@@ -543,18 +555,15 @@ impl MutTxId {
 
     /// For each parameter of a view, insert a row into `st_view_param`.
     /// This does not include the context parameter.
-    fn insert_into_st_view_param(&mut self, view_id: ViewDatabaseId, params: &ProductType) -> Result<()> {
-        for (i, field) in params.elements.iter().enumerate() {
+    fn insert_into_st_view_param(&mut self, view_id: ViewDatabaseId, params: &[ViewParamDef]) -> Result<()> {
+        for ViewParamDef { name, col_id, ty, .. } in params {
             self.insert_via_serialize_bsatn(
                 ST_VIEW_PARAM_ID,
                 &StViewParamRow {
                     view_id,
-                    param_pos: i.into(),
-                    param_name: field
-                        .name
-                        .clone()
-                        .unwrap_or_else(|| format!("param_{i}").into_boxed_str()),
-                    param_type: field.algebraic_type.clone().into(),
+                    param_pos: *col_id,
+                    param_name: name.clone().into(),
+                    param_type: ty.clone().into(),
                 },
             )?;
         }