From ced5aec2c7623f201f1301ef2462c9282da7ce47 Mon Sep 17 00:00:00 2001
From: PThorpe92 <preston@turso.tech>
Date: Sun, 16 Nov 2025 19:19:24 -0500
Subject: [PATCH] Add ColDef arguments to Column::new in collate.rs

---
 core/incremental/compiler.rs | 68 ++++++++++++++++++++----------------
 core/translate/collate.rs    | 24 +++++--------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/core/incremental/compiler.rs b/core/incremental/compiler.rs
index 3e25787a6..f04c4acc0 100644
--- a/core/incremental/compiler.rs
+++ b/core/incremental/compiler.rs
@@ -2254,7 +2254,7 @@ mod tests {
     use super::*;
     use crate::incremental::dbsp::Delta;
     use crate::incremental::operator::{FilterOperator, FilterPredicate};
-    use crate::schema::{BTreeTable, Column as SchemaColumn, Schema, Type};
+    use crate::schema::{BTreeTable, ColDef, Column as SchemaColumn, Schema, Type};
     use crate::storage::pager::CreateBTreeFlags;
     use crate::translate::logical::{ColumnInfo, LogicalPlanBuilder, LogicalSchema};
     use crate::util::IOExt;
@@ -2278,11 +2278,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_text(
                         Some("name".to_string()),
@@ -2320,11 +2321,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_text(
                         Some("product_name".to_string()),
@@ -2362,11 +2364,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_integer(
                         Some("user_id".to_string()),
@@ -2406,11 +2409,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_text(
                         Some("name".to_string()),
@@ -2440,11 +2444,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_integer(
                         Some("customer_id".to_string()),
@@ -2484,11 +2489,12 @@ mod tests {
                         None,
                         Type::Integer,
                         None,
-                        true,
-                        true,
-                        true,
-                        false,
-                        false,
+                        ColDef {
+                            primary_key: true,
+                            rowid_alias: true,
+                            notnull: true,
+                            ..Default::default()
+                        },
                     ),
                     SchemaColumn::new_default_text(
                         Some("name".to_string()),
diff --git a/core/translate/collate.rs b/core/translate/collate.rs
index edd74dd77..e59cf342b 100644
--- a/core/translate/collate.rs
+++ b/core/translate/collate.rs
@@ -413,11 +413,7 @@ mod tests {
                     None,
                     Type::Text,
                     left,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
+                    ColDef::default(),
                 )],
                 unique_sets: vec![],
                 foreign_keys: vec![],
@@ -447,11 +443,7 @@ mod tests {
                     None,
                     Type::Text,
                     right,
-                    false,
-                    false,
-                    false,
-                    false,
-                    false,
+                    ColDef::default(),
                 )],
                 unique_sets: vec![],
                 foreign_keys: vec![],
@@ -488,11 +480,13 @@ mod tests {
                     None,
                     Type::Integer,
                     collation,
-                    true,
-                    true,
-                    false,
-                    true,
-                    false,
+                    ColDef {
+                        primary_key: true,
+                        rowid_alias: true,
+                        notnull: false,
+                        unique: true,
+                        hidden: false,
+                    },
                 )],
                 unique_sets: vec![],
                 foreign_keys: vec![],