Added ColumnType::Blob (#777)

SeaQL · May 3, 2024 · 12fe34b · 12fe34b
1 parent 33c0dae
commit 12fe34b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@ assert_eq!(
         .col(ColumnDef::new(Alias::new("boolean_col")).boolean())
         .col(ColumnDef::new(Alias::new("binary2")).binary_len(1024))
         .col(ColumnDef::new(Alias::new("binary3")).var_binary(1024))
+        .col(ColumnDef::new(Alias::new("binary4")).blob())
         .to_string(SqliteQueryBuilder),
     [
         r#"CREATE TABLE "strange" ( "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,"#,
@@ -77,7 +78,8 @@ assert_eq!(
             r#""datetime_col" datetime_text,"#,
             r#""boolean_col" boolean,"#,
             r#""binary2" blob(1024),"#,
-            r#""binary3" varbinary_blob(1024)"#,
+            r#""binary3" varbinary_blob(1024),"#,
+            r#""binary4" blob"#,
         r#")"#,
     ]
     .join(" ")
@@ -91,7 +93,7 @@ assert_eq!(
         .table(BinaryType::Table)
         .col(ColumnDef::new(BinaryType::BinaryLen).binary_len(32))
         .col(ColumnDef::new(BinaryType::Binary).binary())
-        .col(ColumnDef::new(BinaryType::Blob).custom(MySqlType::Blob))
+        .col(ColumnDef::new(BinaryType::Blob).blob())
         .col(ColumnDef::new(BinaryType::TinyBlob).custom(MySqlType::TinyBlob))
         .col(ColumnDef::new(BinaryType::MediumBlob).custom(MySqlType::MediumBlob))
         .col(ColumnDef::new(BinaryType::LongBlob).custom(MySqlType::LongBlob))

diff --git a/src/backend/mysql/table.rs b/src/backend/mysql/table.rs
@@ -62,6 +62,7 @@ impl TableBuilder for MysqlQueryBuilder {
                     StringLen::None => "varbinary(255)".into(),
                     StringLen::Max => "varbinary(65535)".into(),
                 },
+                ColumnType::Blob => "blob".into(),
                 ColumnType::Bit(length) => {
                     match length {
                         Some(length) => format!("bit({length})"),

diff --git a/src/backend/postgres/table.rs b/src/backend/postgres/table.rs
@@ -47,7 +47,8 @@ impl TableBuilder for PostgresQueryBuilder {
                     }
                     typ
                 }
-                ColumnType::Binary(_) | ColumnType::VarBinary(_) => "bytea".into(),
+                ColumnType::Binary(_) | ColumnType::VarBinary(_) | ColumnType::Blob =>
+                    "bytea".into(),
                 ColumnType::Bit(length) => {
                     match length {
                         Some(length) => format!("bit({length})"),

diff --git a/src/backend/sqlite/table.rs b/src/backend/sqlite/table.rs
@@ -172,6 +172,7 @@ impl SqliteQueryBuilder {
                     StringLen::N(length) => format!("varbinary_blob({length})"),
                     _ => "varbinary_blob".into(),
                 },
+                ColumnType::Blob => "blob".into(),
                 ColumnType::Boolean => "boolean".into(),
                 ColumnType::Money(precision) => match precision {
                     Some((precision, scale)) => format!("real_money({precision}, {scale})"),

diff --git a/src/extension/mysql/column.rs b/src/extension/mysql/column.rs
@@ -2,7 +2,6 @@ use crate::Iden;
 
 #[derive(Debug, Copy, Clone)]
 pub enum MySqlType {
-    Blob,
     TinyBlob,
     MediumBlob,
     LongBlob,
@@ -11,7 +10,6 @@ pub enum MySqlType {
 impl Iden for MySqlType {
     fn unquoted(&self, s: &mut dyn std::fmt::Write) {
         let ty = match self {
-            Self::Blob => "blob",
             Self::TinyBlob => "tinyblob",
             Self::MediumBlob => "mediumblob",
             Self::LongBlob => "longblob",

diff --git a/src/table/column.rs b/src/table/column.rs
@@ -38,6 +38,7 @@ pub trait IntoColumnDef {
 /// | Date                  | date              | date                        | date_text                    |
 /// | Year                  | year              | N/A                         | N/A                          |
 /// | Interval              | N/A               | interval                    | N/A                          |
+/// | Blob                  | blob              | bytea                       | blob                         |
 /// | Binary                | binary            | bytea                       | blob                         |
 /// | VarBinary             | varbinary         | bytea                       | varbinary_blob               |
 /// | Bit                   | bit               | bit                         | N/A                          |
@@ -59,6 +60,7 @@ pub enum ColumnType {
     Char(Option<u32>),
     String(StringLen),
     Text,
+    Blob,
     TinyInteger,
     SmallInteger,
     Integer,
@@ -512,10 +514,10 @@ impl ColumnDef {
         self
     }
 
-    #[cfg(feature = "backend-mysql")]
-    /// Set column type as blob. MySQL only.
+    /// Set column type as blob
     pub fn blob(&mut self) -> &mut Self {
-        self.custom(crate::extension::mysql::MySqlType::Blob)
+        self.types = Some(ColumnType::Blob);
+        self
     }
 
     /// Set column type as boolean

diff --git a/tests/mysql/table.rs b/tests/mysql/table.rs
@@ -189,7 +189,7 @@ fn create_7() {
     assert_eq!(
         Table::create()
             .table(Char::Table)
-            .col(ColumnDef::new(BinaryType::Blob).custom(MySqlType::Blob))
+            .col(ColumnDef::new(BinaryType::Blob).blob())
             .col(ColumnDef::new(Char::Character).binary())
             .col(ColumnDef::new(Char::FontSize).binary_len(10))
             .col(ColumnDef::new(Char::SizeW).var_binary(10))