Fixup

Author: tyt2y3

sea-orm-migration/src/migrator.rs

@@ -304,7 +304,7 @@ where
                 constraint_name, table_name
             );
             let mut stmt = ForeignKey::drop();
-            stmt.table(table_name.as_str())
+            stmt.table(Alias::new(table_name.as_str()))
                 .name(constraint_name.as_str());
             db.execute(db_backend.build(&stmt)).await?;
             info!("Foreign key '{}' has been dropped", constraint_name);
@@ -319,7 +319,7 @@ where
         let table_name: String = row.try_get("", "table_name")?;
         info!("Dropping table '{}'", table_name);
         let mut stmt = Table::drop();
-        stmt.table(table_name.as_str())
+        stmt.table(Alias::new(table_name.as_str()))
             .if_exists()
             .cascade();
         db.execute(db_backend.build(&stmt)).await?;
@@ -335,7 +335,7 @@ where
             let type_name: String = row.try_get("", "typname")?;
             info!("Dropping type '{}'", type_name);
             let mut stmt = Type::drop();
-            stmt.name(&type_name);
+            stmt.name(Alias::new(&type_name));
             db.execute(db_backend.build(&stmt)).await?;
             info!("Type '{}' has been dropped", type_name);
         }

sea-orm-migration/src/schema.rs

@@ -609,5 +609,5 @@ pub fn timestamps(t: TableCreateStatement) -> TableCreateStatement {
 
 /// Create an Alias.
 pub fn name<T: Into<String>>(name: T) -> Alias {
-    name
+    Alias::new(name)
 }

src/executor/query.rs

@@ -1,6 +1,6 @@
 pub use crate::error::TryGetError;
 use crate::{
-    error::{json_err, type_err, DbErr},
+    error::{type_err, DbErr},
     SelectGetableValue, SelectorRaw, Statement,
 };
 use std::fmt;
@@ -1342,15 +1342,19 @@ where
                     debug_print!("{:#?}", e.to_string());
                     err_null_idx_col(idx)
                 })
-                .and_then(|json| serde_json::from_value(json).map_err(|e| json_err(e).into())),
+                .and_then(|json| {
+                    serde_json::from_value(json).map_err(|e| crate::error::json_err(e).into())
+                }),
             #[cfg(feature = "proxy")]
             QueryResultRow::Proxy(row) => row
                 .try_get::<serde_json::Value, I>(idx)
                 .map_err(|e| {
                     debug_print!("{:#?}", e.to_string());
                     err_null_idx_col(idx)
                 })
-                .and_then(|json| serde_json::from_value(json).map_err(|e| json_err(e).into())),
+                .and_then(|json| {
+                    serde_json::from_value(json).map_err(|e| crate::error::json_err(e).into())
+                }),
             #[allow(unreachable_patterns)]
             _ => unreachable!(),
         }
@@ -1362,7 +1366,7 @@ where
             serde_json::Value::Array(values) => {
                 let mut res = Vec::new();
                 for item in values {
-                    res.push(serde_json::from_value(item).map_err(json_err)?);
+                    res.push(serde_json::from_value(item).map_err(crate::error::json_err)?);
                 }
                 Ok(res)
             }