sea-orm-codegen: PostgreSQL enum arrays (#1678)

* sea-orm-codegen: PostgreSQL enum arrays * Refactoring --------- Co-authored-by: Billy Chan <ccw.billy.123@gmail.com>
SeaQL · Jul 21, 2023 · 73a5783 · 73a5783
1 parent 217894d
commit 73a5783
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/sea-orm-codegen/src/entity/column.rs b/sea-orm-codegen/src/entity/column.rs
@@ -249,6 +249,13 @@ impl Column {
             quote! {}
         }
     }
+
+    pub fn get_inner_col_type(&self) -> &ColumnType {
+        match &self.col_type {
+            ColumnType::Array(inner_col_type) => inner_col_type.as_ref(),
+            _ => &self.col_type,
+        }
+    }
 }
 
 impl From<ColumnDef> for Column {

diff --git a/sea-orm-codegen/src/entity/transformer.rs b/sea-orm-codegen/src/entity/transformer.rs
@@ -58,7 +58,8 @@ impl EntityTransformer {
                     col
                 })
                 .map(|col| {
-                    if let sea_query::ColumnType::Enum { name, variants } = &col.col_type {
+                    if let sea_query::ColumnType::Enum { name, variants } = col.get_inner_col_type()
+                    {
                         enums.insert(
                             name.to_string(),
                             ActiveEnum {

diff --git a/sea-orm-codegen/src/entity/writer.rs b/sea-orm-codegen/src/entity/writer.rs
@@ -461,7 +461,7 @@ impl EntityWriter {
             .columns
             .iter()
             .fold(TokenStream::new(), |mut ts, col| {
-                if let sea_query::ColumnType::Enum { name, .. } = &col.col_type {
+                if let sea_query::ColumnType::Enum { name, .. } = col.get_inner_col_type() {
                     let enum_name = format_ident!("{}", name.to_string().to_upper_camel_case());
                     ts.extend([quote! {
                         use super::sea_orm_active_enums::#enum_name;