Merge branch 'master' into 0.15.x

SeaQL · Feb 2, 2024 · 5c0b2b2 · 5c0b2b2
2 parents 19de9b5 + 3d46e85
commit 5c0b2b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/mysql/writer/column.rs b/src/mysql/writer/column.rs
@@ -121,7 +121,7 @@ impl ColumnInfo {
                 col_def.timestamp();
             }
             Type::Year => {
-                col_def.year(None);
+                col_def.year();
             }
             Type::Char(str_attr) => {
                 match str_attr.length {

diff --git a/tests/live/mysql/src/main.rs b/tests/live/mysql/src/main.rs
@@ -435,7 +435,7 @@ fn create_db_types_table() -> TableCreateStatement {
         .col(ColumnDef::new(Alias::new("bit_1")).bit(Some(1)))
         .col(ColumnDef::new(Alias::new("bit_2")).bit(Some(16)))
         .col(ColumnDef::new(Alias::new("bit_3")).bit(Some(32)))
-        .col(ColumnDef::new(Alias::new("year")).year(None))
+        .col(ColumnDef::new(Alias::new("year")).year())
         .primary_key(Index::create().col(Alias::new("id")))
         .engine("InnoDB")
         .character_set("utf8mb4")