Skip to content

Views: fix table schema creation from system table. #3615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shubham8287 merged 2 commits into from
Nov 10, 2025
Merged

Views: fix table schema creation from system table. #3615

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e4fd8
view fix sys table schema
Shubham8287 Nov 10, 2025
36f78f2
backward compatible
Shubham8287 Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions crates/datastore/src/locking_tx_datastore/state_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ use crate::error::{DatastoreError, TableError};
use crate::system_tables::{
ConnectionIdViaU128, StColumnFields, StColumnRow, StConnectionCredentialsFields, StConnectionCredentialsRow,
StConstraintFields, StConstraintRow, StIndexFields, StIndexRow, StScheduledFields, StScheduledRow,
StSequenceFields, StSequenceRow, StTableFields, StTableRow, SystemTable, ST_COLUMN_ID,
ST_CONNECTION_CREDENTIALS_ID, ST_CONSTRAINT_ID, ST_INDEX_ID, ST_SCHEDULED_ID, ST_SEQUENCE_ID, ST_TABLE_ID,
StSequenceFields, StSequenceRow, StTableFields, StTableRow, StViewFields, StViewParamFields, StViewRow,
SystemTable, ST_COLUMN_ID, ST_CONNECTION_CREDENTIALS_ID, ST_CONSTRAINT_ID, ST_INDEX_ID, ST_SCHEDULED_ID,
ST_SEQUENCE_ID, ST_TABLE_ID, ST_VIEW_ID, ST_VIEW_PARAM_ID,
};
use anyhow::anyhow;
use core::ops::RangeBounds;
use spacetimedb_lib::ConnectionId;
use spacetimedb_primitives::{ColList, TableId};
use spacetimedb_sats::AlgebraicValue;
use spacetimedb_schema::schema::{ColumnSchema, TableSchema};
use spacetimedb_schema::schema::{ColumnSchema, TableSchema, ViewInfo};
use spacetimedb_table::{
blob_store::HashMapBlobStore,
table::{IndexScanRangeIter, RowRef, Table, TableScanIter},
Expand Down Expand Up @@ -120,10 +121,35 @@ pub trait StateView {
})
.transpose()?;

// Look up the view info for the table in question, if any.
let view_info: Option<ViewInfo> = self
.iter_by_col_eq(
ST_VIEW_ID,
StViewFields::TableId,
&AlgebraicValue::OptionSome(value_eq.clone()),
)
.map(|mut iter| {
iter.next().map(|row| -> Result<_> {
let row = StViewRow::try_from(row)?;
let has_args = self
.iter_by_col_eq(ST_VIEW_PARAM_ID, StViewParamFields::ViewId, &row.view_id.into())?
.next()
.is_some();

Ok(ViewInfo {
view_id: row.view_id,
has_args,
is_anonymous: row.is_anonymous,
})
})
})
.unwrap_or(None)
.transpose()?;

Ok(TableSchema::new(
table_id,
table_name,
None,
view_info,
columns,
indexes,
constraints,
Expand Down
Loading