chore: re-export sea_query::BlobSize in sea_orm::entity::prelude (#…

…1548)
SeaQL · Mar 20, 2023 · f646aa7 · f646aa7
1 parent 5ba9aba
commit f646aa7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/sea-orm-codegen/src/entity/column.rs b/sea-orm-codegen/src/entity/column.rs
@@ -143,19 +143,19 @@ impl Column {
                 ColumnType::Time => quote! { ColumnType::Time },
                 ColumnType::Date => quote! { ColumnType::Date },
                 ColumnType::Binary(BlobSize::Blob(None)) => {
-                    quote! { ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(None)) }
+                    quote! { ColumnType::Binary(BlobSize::Blob(None)) }
                 }
                 ColumnType::Binary(BlobSize::Blob(Some(s))) => {
-                    quote! { ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(Some(#s))) }
+                    quote! { ColumnType::Binary(BlobSize::Blob(Some(#s))) }
                 }
                 ColumnType::Binary(BlobSize::Tiny) => {
-                    quote! { ColumnType::Binary(sea_orm::sea_query::BlobSize::Tiny) }
+                    quote! { ColumnType::Binary(BlobSize::Tiny) }
                 }
                 ColumnType::Binary(BlobSize::Medium) => {
-                    quote! { ColumnType::Binary(sea_orm::sea_query::BlobSize::Medium) }
+                    quote! { ColumnType::Binary(BlobSize::Medium) }
                 }
                 ColumnType::Binary(BlobSize::Long) => {
-                    quote! { ColumnType::Binary(sea_orm::sea_query::BlobSize::Long) }
+                    quote! { ColumnType::Binary(BlobSize::Long) }
                 }
                 ColumnType::VarBinary(s) => {
                     quote! { ColumnType::VarBinary(#s) }
@@ -517,11 +517,11 @@ mod tests {
             "ColumnType::BigUnsigned.def()",
             "ColumnType::Float.def()",
             "ColumnType::Double.def()",
-            "ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(None)).def()",
-            "ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(Some(10u32))).def()",
-            "ColumnType::Binary(sea_orm::sea_query::BlobSize::Tiny).def()",
-            "ColumnType::Binary(sea_orm::sea_query::BlobSize::Medium).def()",
-            "ColumnType::Binary(sea_orm::sea_query::BlobSize::Long).def()",
+            "ColumnType::Binary(BlobSize::Blob(None)).def()",
+            "ColumnType::Binary(BlobSize::Blob(Some(10u32))).def()",
+            "ColumnType::Binary(BlobSize::Tiny).def()",
+            "ColumnType::Binary(BlobSize::Medium).def()",
+            "ColumnType::Binary(BlobSize::Long).def()",
             "ColumnType::VarBinary(10u32).def()",
             "ColumnType::Boolean.def()",
             "ColumnType::Date.def()",

diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs
@@ -1,9 +1,9 @@
 pub use crate::{
-    error::*, ActiveEnum, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait,
-    ColumnType, ColumnTypeTrait, ConnectionTrait, CursorTrait, DatabaseConnection, DbConn,
-    EntityName, EntityTrait, EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, LoaderTrait,
-    ModelTrait, PaginatorTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult,
-    Related, RelationDef, RelationTrait, Select, Value,
+    error::*, sea_query::BlobSize, ActiveEnum, ActiveModelBehavior, ActiveModelTrait, ColumnDef,
+    ColumnTrait, ColumnType, ColumnTypeTrait, ConnectionTrait, CursorTrait, DatabaseConnection,
+    DbConn, EntityName, EntityTrait, EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked,
+    LoaderTrait, ModelTrait, PaginatorTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter,
+    QueryResult, Related, RelationDef, RelationTrait, Select, Value,
 };
 
 #[cfg(feature = "macros")]

diff --git a/tests/common/features/binary.rs b/tests/common/features/binary.rs
@@ -1,4 +1,4 @@
-use sea_orm::{entity::prelude::*, sea_query::BlobSize};
+use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "binary")]