Upgrade sea-query to 0.26.0

Ameobea · Jul 1, 2022 · 2e42cf7 · 2e42cf7
1 parent e92631c
commit 2e42cf7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,9 +35,9 @@ path = "src/lib.rs"
 [dependencies]
 futures = { version = "0.3", optional = true }
 sea-schema-derive = { version = "0.1.0", path = "sea-schema-derive" }
-sea-query = { version = "^0.25.0" }
+sea-query = { version = "^0.26.0" }
 serde = { version = "^1", features = ["derive"], optional = true }
-sqlx = { version = "^0.5", optional = true }
+sqlx = { version = "^0.6", optional = true }
 log = { version = "^0.4", optional = true }
 
 [features]

diff --git a/src/mysql/parser/column.rs b/src/mysql/parser/column.rs
@@ -1,7 +1,7 @@
 use crate::mysql::def::*;
 use crate::mysql::query::ColumnQueryResult;
 use crate::{parser::Parser, Name};
-use sea_query::unescape_string;
+use sea_query::{EscapeBuilder, MysqlQueryBuilder};
 
 impl ColumnQueryResult {
     pub fn parse(self) -> ColumnInfo {
@@ -195,7 +195,7 @@ fn parse_enum_definition(parser: &mut Parser, mut ctype: ColumnType) -> ColumnTy
                 ctype
                     .get_enum_def_mut()
                     .values
-                    .push(unescape_string(word.unquote().unwrap().as_str()));
+                    .push(MysqlQueryBuilder.unescape_string(word.unquote().unwrap().as_str()));
                 parser.next_if_punctuation(",");
             } else if parser.curr_is_unquoted() {
                 todo!("there can actually be numeric enum values but is very confusing");
@@ -218,7 +218,7 @@ fn parse_set_definition(parser: &mut Parser, mut ctype: ColumnType) -> ColumnTyp
                 ctype
                     .get_set_def_mut()
                     .members
-                    .push(unescape_string(word.unquote().unwrap().as_str()));
+                    .push(MysqlQueryBuilder.unescape_string(word.unquote().unwrap().as_str()));
                 parser.next_if_punctuation(",");
             } else if parser.curr_is_unquoted() {
                 todo!("there can actually be numeric set values but is very confusing");

diff --git a/src/mysql/writer/column.rs b/src/mysql/writer/column.rs
@@ -1,5 +1,5 @@
 use crate::mysql::def::{CharSet, ColumnInfo, NumericAttr, StringAttr, Type};
-use sea_query::{escape_string, Alias, BlobSize, ColumnDef, Iden};
+use sea_query::{Alias, BlobSize, ColumnDef, EscapeBuilder, Iden, MysqlQueryBuilder};
 use std::fmt::Write;
 
 impl ColumnInfo {
@@ -23,7 +23,12 @@ impl ColumnInfo {
         }
         if !self.comment.is_empty() {
             let mut string = "".to_owned();
-            write!(&mut string, "COMMENT '{}'", escape_string(&self.comment)).unwrap();
+            write!(
+                &mut string,
+                "COMMENT '{}'",
+                MysqlQueryBuilder.escape_string(&self.comment)
+            )
+            .unwrap();
             extras.push(string);
         }
         if !extras.is_empty() {

diff --git a/src/mysql/writer/types.rs b/src/mysql/writer/types.rs
@@ -1,7 +1,7 @@
 use crate::mysql::def::{
     BlobAttr, EnumDef, GeometryAttr, NumericAttr, SetDef, StringAttr, TimeAttr, Type,
 };
-use sea_query::{escape_string, Iden};
+use sea_query::{EscapeBuilder, Iden, MysqlQueryBuilder};
 
 impl Iden for Type {
     fn unquoted(&self, s: &mut dyn std::fmt::Write) {
@@ -226,7 +226,7 @@ impl Type {
             if i > 0 {
                 write!(s, ", ").unwrap();
             }
-            write!(s, "\'{}\'", escape_string(val.as_str())).unwrap();
+            write!(s, "\'{}\'", MysqlQueryBuilder.escape_string(val.as_str())).unwrap();
         }
         write!(s, ")").unwrap();
         Self::write_string_attr(s, &def.attr);
@@ -238,7 +238,7 @@ impl Type {
             if i > 0 {
                 write!(s, ", ").unwrap();
             }
-            write!(s, "\'{}\'", escape_string(val.as_str())).unwrap();
+            write!(s, "\'{}\'", MysqlQueryBuilder.escape_string(val.as_str())).unwrap();
         }
         write!(s, ")").unwrap();
         Self::write_string_attr(s, &def.attr);