Merge branch 'pr-117-and-122' into data-type-blob

SeaQL · Jan 31, 2024 · e14ef16 · e14ef16
2 parents aeb1a58 + cf31969
commit e14ef16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,8 +36,8 @@ path = "src/lib.rs"
 [dependencies]
 futures = { version = "0.3", default-features = false, optional = true, features = ["alloc"] }
 sea-schema-derive = { version = "0.2.0", path = "sea-schema-derive", default-features = false }
-sea-query = { version = "0.31.0", git = "https://github.com/seaql/sea-query", branch = "data-type-blob", default-features = false, features = ["derive"] }
-sea-query-binder = { version = "0.5.0", git = "https://github.com/seaql/sea-query", branch = "data-type-blob", default-features = false, optional = true }
+sea-query = { version = "0.31.0", git = "https://github.com/seaql/sea-query", default-features = false, features = ["derive"] }
+sea-query-binder = { version = "0.5.0", git = "https://github.com/seaql/sea-query", default-features = false, optional = true }
 serde = { version = "1", default-features = false, optional = true, features = ["derive"] }
 sqlx = { version = "0.7", default-features = false, optional = true }
 log = { version = "0.4", default-features = false, optional = true }

diff --git a/src/mysql/writer/column.rs b/src/mysql/writer/column.rs
@@ -155,7 +155,7 @@ impl ColumnInfo {
             }
             Type::Binary(str_attr) => {
                 match str_attr.length {
-                    Some(length) => col_def.binary(length),
+                    Some(length) => col_def.binary_len(length),
                     None => col_def.custom(MySqlType::Blob),
                 };
                 col_def = self.write_str_attr(col_def, str_attr);
@@ -184,7 +184,7 @@ impl ColumnInfo {
             }
             Type::Blob(blob_attr) => {
                 match blob_attr.length {
-                    Some(length) => col_def.binary(length),
+                    Some(length) => col_def.binary_len(length),
                     None => col_def.custom(MySqlType::Blob),
                 };
             }

diff --git a/tests/live/sqlite/src/main.rs b/tests/live/sqlite/src/main.rs
@@ -4,8 +4,8 @@ use sqlx::SqlitePool;
 use std::collections::HashMap;
 
 use sea_schema::sea_query::{
-    Alias, ColumnDef, Expr, ForeignKey, ForeignKeyAction, ForeignKeyCreateStatement, Index, Query,
-    SqliteQueryBuilder, Table, TableCreateStatement, TableRef,
+    Alias, BlobSize, ColumnDef, Expr, ForeignKey, ForeignKeyAction, ForeignKeyCreateStatement,
+    Index, Query, SqliteQueryBuilder, Table, TableCreateStatement, TableRef,
 };
 use sea_schema::sqlite::{
     def::TableDef,