Overhaul schema metadata handling in preparation for geometry columns.

Author: ignatz

crates/core/Cargo.toml

@@ -48,6 +48,7 @@ ed25519-dalek = { version = "2.1.1", features = ["pkcs8", "pem", "rand_core"] }
 fallible-iterator = "0.3.0"
 form_urlencoded = "1.2.1"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
+# geos = { version = "10.0.0", default-features = false, features = ["geo", "json"] }
 http-body-util = "0.1.3"
 hyper = "1.6.0"
 hyper-util = "0.1.7"

crates/core/src/admin/logs/list_logs.rs

@@ -55,7 +55,7 @@ pub async fn list_logs_handler(
       &[table],
     )?;
 
-    build_filter_where_clause(TABLE_ALIAS, &table_metadata.schema.columns, filter_params)?
+    build_filter_where_clause(TABLE_ALIAS, &table_metadata.column_metadata, filter_params)?
   };
 
   let total_row_count: i64 = conn

crates/core/src/admin/logs/stats.rs

@@ -52,7 +52,7 @@ pub async fn fetch_stats_handler(
       &[table],
     )?;
 
-    build_filter_where_clause(TABLE_ALIAS, &table_metadata.schema.columns, filter_params)?
+    build_filter_where_clause(TABLE_ALIAS, &table_metadata.column_metadata, filter_params)?
   };
 
   let now = Utc::now();

crates/core/src/admin/rows/delete_rows.rs

@@ -5,7 +5,7 @@ use axum::{
   response::{IntoResponse, Response},
 };
 use serde::{Deserialize, Serialize};
-use trailbase_schema::{QualifiedName, QualifiedNameEscaped};
+use trailbase_schema::{QualifiedName, QualifiedNameEscaped, metadata::find_file_column_indexes};
 use trailbase_sqlvalue::SqlValue;
 use ts_rs::TS;
 
@@ -54,21 +54,24 @@ pub(crate) async fn delete_row(
     )));
   };
 
-  let Some((_index, column)) = table_metadata.column_by_name(pk_col) else {
+  let Some(meta) = table_metadata.column_by_name(pk_col) else {
     return Err(Error::Precondition(format!("Missing column: {pk_col}")));
   };
 
+  let column = &meta.column;
   if !column.is_primary() {
     return Err(Error::Precondition(format!("Not a primary key: {pk_col}")));
   }
 
+  let has_file_columns = !find_file_column_indexes(&table_metadata.column_metadata).is_empty();
+
   run_delete_query(
     &conn,
     state.objectstore(),
     &QualifiedNameEscaped::from(&table_metadata.schema.name),
     pk_col,
     pk_value.try_into()?,
-    table_metadata.json_metadata.has_file_columns(),
+    has_file_columns,
   )
   .await?;
 

crates/core/src/admin/rows/list_rows.rs

@@ -90,7 +90,7 @@ pub async fn list_rows_handler(
 
   let cursor_column = table_or_view.record_pk_column();
   let cursor = match (cursor, cursor_column) {
-    (Some(cursor), Some((_idx, c))) => Some(parse_cursor(&cursor, c)?),
+    (Some(cursor), Some(meta)) => Some(parse_cursor(&cursor, &meta.column)?),
     _ => None,
   };
   let (rows, columns) = fetch_rows(
@@ -99,7 +99,7 @@ pub async fn list_rows_handler(
     filter_where_clause,
     &order,
     Pagination {
-      cursor_column: cursor_column.map(|(_idx, c)| c),
+      cursor_column: cursor_column.map(|meta| &meta.column),
       cursor,
       offset,
       limit: limit_or_default(limit, None).map_err(|err| Error::BadRequest(err.into()))?,
@@ -108,10 +108,10 @@ pub async fn list_rows_handler(
   .await?;
 
   let next_cursor = if order.is_none() {
-    cursor_column.and_then(|(col_idx, _col)| {
+    cursor_column.and_then(|meta| {
       let row = rows.last()?;
-      assert!(row.len() > col_idx);
-      match &row[col_idx] {
+      assert!(row.len() > meta.index);
+      match &row[meta.index] {
         SqlValue::Integer(n) => Some(n.to_string()),
         SqlValue::Blob(b) => {
           // Should be a base64 encoded [u8; 16] id.
@@ -130,7 +130,10 @@ pub async fn list_rows_handler(
     // NOTE: in the view case we don't have a good way of extracting the columns from the "CREATE
     // VIEW" query so we fall back to columns constructed from the returned data.
     columns: match table_or_view.columns() {
-      Some(schema_columns) if !schema_columns.is_empty() => schema_columns.to_vec(),
+      Some(schema_columns) if !schema_columns.is_empty() => schema_columns
+        .iter()
+        .map(|meta| meta.column.clone())
+        .collect(),
       _ => {
         // VIRTUAL TABLE or VIEW case.
         debug!("Falling back to inferred cols for view: {table_name:?}");

crates/core/src/admin/rows/read_files.rs

@@ -3,7 +3,6 @@ use axum::{
   response::Response,
 };
 use serde::Deserialize;
-use trailbase_schema::metadata::TableOrViewMetadata;
 use trailbase_schema::{FileUploads, QualifiedName};
 use ts_rs::TS;
 
@@ -39,45 +38,31 @@ pub async fn read_files_handler(
       "Table {table_name:?} not found"
     )));
   };
-  let Some((_index, pk_col)) = table_or_view.column_by_name(&query.pk_column) else {
+  let Some(pk_meta) = table_or_view.column_by_name(&query.pk_column) else {
     return Err(Error::Precondition(format!(
       "Missing PK column: {}",
       query.pk_column
     )));
   };
 
+  let pk_col = &pk_meta.column;
   if !pk_col.is_primary() {
     return Err(Error::Precondition(format!(
       "Not a primary key: {pk_col:?}"
     )));
   }
 
-  let Some((index, file_col_metadata)) = table_or_view.column_by_name(&query.file_column_name)
-  else {
+  let Some(file_column_meta) = table_or_view.column_by_name(&query.file_column_name) else {
     return Err(Error::Precondition(format!(
       "Missing file column: {}",
       query.file_column_name
     )));
   };
 
-  let Some(file_col_json_metadata) = (match table_or_view {
-    TableOrViewMetadata::Table(t) => t.json_metadata.columns[index].as_ref(),
-    TableOrViewMetadata::View(v) => v
-      .json_metadata
-      .as_ref()
-      .and_then(|j| j.columns[index].as_ref()),
-  }) else {
-    return Err(Error::Precondition(format!(
-      "Not a JSON column: {}",
-      query.file_column_name
-    )));
-  };
-
   let FileUploads(mut file_uploads) = run_get_files_query(
     &conn,
     &table_name.into(),
-    file_col_metadata,
-    file_col_json_metadata,
+    file_column_meta,
     &query.pk_column,
     trailbase_schema::json::parse_string_to_sqlite_value(pk_col.data_type, query.pk_value)?,
   )

crates/core/src/admin/rows/update_row.rs

@@ -46,16 +46,17 @@ pub async fn update_row_handler(
   };
 
   let pk_col = &request.primary_key_column;
-  let Some((index, column)) = table_metadata.column_by_name(pk_col) else {
+  let Some(meta) = table_metadata.column_by_name(pk_col) else {
     return Err(Error::Precondition(format!("Missing column: {pk_col}")));
   };
 
   if let Some(pk_index) = table_metadata.record_pk_column
-    && index != pk_index
+    && meta.index != pk_index
   {
     return Err(Error::Precondition(format!("Pk column mismatch: {pk_col}")));
   }
 
+  let column = &meta.column;
   if !column.is_primary() {
     return Err(Error::Precondition(format!("Not a primary key: {pk_col}")));
   }

crates/core/src/admin/user/list_users.rs

@@ -81,7 +81,7 @@ pub async fn list_users_handler(
   // Where clause contains column filters and offset depending on what's present in the url query
   // string.
   let filter_where_clause =
-    build_filter_where_clause("_ROW_", &table_metadata.schema.columns, filter_params)?;
+    build_filter_where_clause("_ROW_", &table_metadata.column_metadata, filter_params)?;
 
   let total_row_count: i64 = conn
     .read_query_row_f(

crates/core/src/auth/api/avatar.rs

@@ -39,19 +39,14 @@ pub async fn get_avatar_handler(
     return Err(AuthError::Internal("missing table".into()));
   };
 
-  let Some((index, file_column)) = table_metadata.column_by_name("file") else {
+  let Some(file_column_meta) = table_metadata.column_by_name("file") else {
     return Err(AuthError::Internal("missing column".into()));
   };
 
-  let Some(ref column_json_metadata) = table_metadata.json_metadata.columns[index] else {
-    return Err(AuthError::Internal("missing metadata".into()));
-  };
-
   let file_upload = run_get_file_query(
     &conn,
     &trailbase_schema::QualifiedNameEscaped::new(&AVATAR_TABLE_NAME),
-    file_column,
-    column_json_metadata,
+    file_column_meta,
     "user",
     rusqlite::types::Value::Blob(user_id.into()),
   )

crates/core/src/connection.rs

@@ -462,7 +462,11 @@ fn setup_file_deletion_triggers_sync(
   metadata: &ConnectionMetadata,
 ) -> Result<(), trailbase_sqlite::Error> {
   for metadata in metadata.tables.values() {
-    for idx in metadata.json_metadata.file_column_indexes() {
+    for column_meta in &metadata.column_metadata {
+      if !column_meta.is_file {
+        continue;
+      }
+
       let table_name = &metadata.schema.name;
       let unqualified_name = &metadata.schema.name.name;
       let db = metadata
@@ -472,8 +476,7 @@ fn setup_file_deletion_triggers_sync(
         .as_deref()
         .unwrap_or("main");
 
-      let col = &metadata.schema.columns[*idx];
-      let column_name = &col.name;
+      let column_name = &column_meta.column.name;
 
       conn.execute_batch(&format!(
           "\