Add ColDef arguments to Column::new in collate.rs

This commit is contained in:
PThorpe92
2025-11-16 19:19:24 -05:00
parent ca783ccdff
commit ced5aec2c7
2 changed files with 46 additions and 46 deletions

View File

@@ -2254,7 +2254,7 @@ mod tests {
use super::*; use super::*;
use crate::incremental::dbsp::Delta; use crate::incremental::dbsp::Delta;
use crate::incremental::operator::{FilterOperator, FilterPredicate}; 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::storage::pager::CreateBTreeFlags;
use crate::translate::logical::{ColumnInfo, LogicalPlanBuilder, LogicalSchema}; use crate::translate::logical::{ColumnInfo, LogicalPlanBuilder, LogicalSchema};
use crate::util::IOExt; use crate::util::IOExt;
@@ -2278,11 +2278,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_text( SchemaColumn::new_default_text(
Some("name".to_string()), Some("name".to_string()),
@@ -2320,11 +2321,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_text( SchemaColumn::new_default_text(
Some("product_name".to_string()), Some("product_name".to_string()),
@@ -2362,11 +2364,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_integer( SchemaColumn::new_default_integer(
Some("user_id".to_string()), Some("user_id".to_string()),
@@ -2406,11 +2409,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_text( SchemaColumn::new_default_text(
Some("name".to_string()), Some("name".to_string()),
@@ -2440,11 +2444,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_integer( SchemaColumn::new_default_integer(
Some("customer_id".to_string()), Some("customer_id".to_string()),
@@ -2484,11 +2489,12 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
None, None,
true, ColDef {
true, primary_key: true,
true, rowid_alias: true,
false, notnull: true,
false, ..Default::default()
},
), ),
SchemaColumn::new_default_text( SchemaColumn::new_default_text(
Some("name".to_string()), Some("name".to_string()),

View File

@@ -413,11 +413,7 @@ mod tests {
None, None,
Type::Text, Type::Text,
left, left,
false, ColDef::default(),
false,
false,
false,
false,
)], )],
unique_sets: vec![], unique_sets: vec![],
foreign_keys: vec![], foreign_keys: vec![],
@@ -447,11 +443,7 @@ mod tests {
None, None,
Type::Text, Type::Text,
right, right,
false, ColDef::default(),
false,
false,
false,
false,
)], )],
unique_sets: vec![], unique_sets: vec![],
foreign_keys: vec![], foreign_keys: vec![],
@@ -488,11 +480,13 @@ mod tests {
None, None,
Type::Integer, Type::Integer,
collation, collation,
true, ColDef {
true, primary_key: true,
false, rowid_alias: true,
true, notnull: false,
false, unique: true,
hidden: false,
},
)], )],
unique_sets: vec![], unique_sets: vec![],
foreign_keys: vec![], foreign_keys: vec![],