Add ViewInfo to TableSchema

Author: joshua-spacetime

crates/schema/src/schema.rs

@@ -50,11 +50,18 @@ pub trait Schema: Sized {
     fn check_compatible(&self, module_def: &ModuleDef, def: &Self::Def) -> Result<(), anyhow::Error>;
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct ViewInfo {
+    pub view_id: ViewId,
+    pub has_args: bool,
+    pub is_anonymous: bool,
+}
+
 /// A wrapper around a [`TableSchema`] for views.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct TableOrViewSchema {
     pub table_id: TableId,
-    pub view_id: Option<(ViewId, bool)>,
+    pub view_info: Option<ViewInfo>,
     pub table_name: Box<str>,
     pub table_access: StAccess,
     inner: Arc<TableSchema>,
@@ -64,7 +71,7 @@ impl From<Arc<TableSchema>> for TableOrViewSchema {
     fn from(inner: Arc<TableSchema>) -> Self {
         Self {
             table_id: inner.table_id,
-            view_id: inner.view_id,
+            view_info: inner.view_info,
             table_name: inner.table_name.clone(),
             table_access: inner.table_access,
             inner,
@@ -75,12 +82,12 @@ impl From<Arc<TableSchema>> for TableOrViewSchema {
 impl TableOrViewSchema {
     /// Is this schema that of a view?
     pub fn is_view(&self) -> bool {
-        self.view_id.is_some()
+        self.view_info.is_some()
     }
 
     /// Is this schema that of an anonymous view?
     pub fn is_anonymous_view(&self) -> bool {
-        self.view_id.is_some_and(|(_, is_anonymous)| is_anonymous)
+        self.view_info.as_ref().is_some_and(|view_info| view_info.is_anonymous)
     }
 
     /// Returns the [`TableSchema`] of the underlying datastore table.
@@ -97,10 +104,29 @@ impl TableOrViewSchema {
     /// For views in particular it will not include the internal `sender` and `arg_id` columns.
     /// Hence columns in this list should be looked up by their [`ColId`] - not their position.
     pub fn public_columns(&self) -> &[ColumnSchema] {
-        if self.is_view() {
-            return &self.inner.columns[2..];
+        match self.view_info {
+            Some(ViewInfo {
+                has_args: true,
+                is_anonymous: false,
+                ..
+            }) => &self.inner.columns[2..],
+            Some(ViewInfo {
+                has_args: true,
+                is_anonymous: true,
+                ..
+            }) => &self.inner.columns[1..],
+            Some(ViewInfo {
+                has_args: false,
+                is_anonymous: false,
+                ..
+            }) => &self.inner.columns[1..],
+            Some(ViewInfo {
+                has_args: false,
+                is_anonymous: true,
+                ..
+            })
+            | None => &self.inner.columns,
         }
-        &self.inner.columns
     }
 
     /// Check if the `col_name` exist on this [`TableOrViewSchema`]
@@ -123,8 +149,7 @@ pub struct TableSchema {
     pub table_name: Box<str>,
 
     /// Is this the backing table of a view?
-    /// Is it an anonymous view?
-    pub view_id: Option<(ViewId, bool)>,
+    pub view_info: Option<ViewInfo>,
 
     /// The columns of the table.
     /// The ordering of the columns is significant. Columns are frequently identified by `ColId`, that is, position in this list.
@@ -171,7 +196,7 @@ impl TableSchema {
     pub fn new(
         table_id: TableId,
         table_name: Box<str>,
-        view_id: Option<(ViewId, bool)>,
+        view_info: Option<ViewInfo>,
         columns: Vec<ColumnSchema>,
         indexes: Vec<IndexSchema>,
         constraints: Vec<ConstraintSchema>,
@@ -185,7 +210,7 @@ impl TableSchema {
             row_type: columns_to_row_type(&columns),
             table_id,
             table_name,
-            view_id,
+            view_info,
             columns,
             indexes,
             constraints,
@@ -230,12 +255,12 @@ impl TableSchema {
 
     /// Is this the backing table for a view?
     pub fn is_view(&self) -> bool {
-        self.view_id.is_some()
+        self.view_info.is_some()
     }
 
     /// Is this the backing table for an anonymous view?
     pub fn is_anonymous_view(&self) -> bool {
-        self.view_id.is_some_and(|(_, is_anonymous)| is_anonymous)
+        self.view_info.as_ref().is_some_and(|view_info| view_info.is_anonymous)
     }
 
     /// Update the table id of this schema.
@@ -681,6 +706,7 @@ impl TableSchema {
             name,
             is_public,
             is_anonymous,
+            param_columns,
             return_columns,
             ..
         } = view_def;
@@ -699,10 +725,16 @@ impl TableSchema {
             StAccess::Private
         };
 
+        let view_info = ViewInfo {
+            view_id: ViewId::SENTINEL,
+            has_args: !param_columns.is_empty(),
+            is_anonymous: *is_anonymous,
+        };
+
         TableSchema::new(
             TableId::SENTINEL,
             (*name).clone().into(),
-            Some((ViewId::SENTINEL, *is_anonymous)),
+            Some(view_info),
             columns,
             vec![],
             vec![],
@@ -815,10 +847,16 @@ impl TableSchema {
             StAccess::Private
         };
 
+        let view_info = ViewInfo {
+            view_id: ViewId::SENTINEL,
+            has_args: !param_columns.is_empty(),
+            is_anonymous: *is_anonymous,
+        };
+
         TableSchema::new(
             TableId::SENTINEL,
             (*name).clone().into(),
-            Some((ViewId::SENTINEL, *is_anonymous)),
+            Some(view_info),
             columns,
             indexes,
             vec![],