Query char_set from information_schema

Author: tyt2y3

Cargo.toml

@@ -27,14 +27,14 @@ 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.9.1" }
+sea-query = { version = "0.9.3" }
 sqlx = { version = "0.5", optional = true }
 
 [features]
-debug_print = []
+debug-print = []
 default = [ "discovery" ]
 def = [ ]
-discovery = [ "futures", "def", "parser", "query" ]
+discovery = [ "futures", "parser" ]
 parser = [ "def", "query" ]
 query = [ ]
 sqlx-dep = [ "sqlx" ]

src/mysql/def/charset.rs src/mysql/def/char_set.rssrc/mysql/def/charset.rs renamed to src/mysql/def/char_set.rs

@@ -1,6 +1,6 @@
 //! To represent MySQL's schema definitions
 
-mod charset;
+mod char_set;
 mod column;
 mod foreign_key;
 mod index;
@@ -10,7 +10,7 @@ mod system;
 mod table;
 mod types;
 
-pub use charset::*;
+pub use char_set::*;
 pub use column::*;
 pub use foreign_key::*;
 pub use index::*;

src/mysql/def/mod.rs

@@ -47,9 +47,14 @@ pub enum Type {
 
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct NumericAttr {
+    /// For integer types, M is the maximum display width (deprecated).
+    /// For decimal types, M is the total number of digits.
     pub maximum: Option<u32>,
+    /// Number of decimal digits.
     pub decimal: Option<u32>,
+    /// Whether this number is unsigned
     pub unsigned: Option<bool>,
+    /// Deprecated. Prefix 0 up to Z number of digits.
     pub zero_fill: Option<bool>,
 }
 

src/mysql/def/types.rs

@@ -9,22 +9,12 @@ impl TableQueryResult {
 }
 
 pub fn parse_table_query_result(result: TableQueryResult) -> TableInfo {
-    let collation = parse_table_collation(result.table_collation.as_str());
-
     TableInfo {
         name: result.table_name,
-        engine: parse_table_engine(result.engine.as_str()),
+        engine: StorageEngine::from_str(result.engine.as_str()).unwrap(),
         auto_increment: result.auto_increment,
-        char_set: collation.char_set(),
-        collation,
+        char_set: CharSet::from_str(result.table_char_set.as_str()).unwrap(),
+        collation: Collation::from_str(result.table_collation.as_str()).unwrap(),
         comment: result.table_comment,
     }
 }
-
-pub fn parse_table_engine(string: &str) -> StorageEngine {
-    StorageEngine::from_str(string).unwrap()
-}
-
-pub fn parse_table_collation(string: &str) -> Collation {
-    Collation::from_str(string).unwrap()
-}

src/mysql/parser/table.rs

@@ -0,0 +1,6 @@
+#[derive(Debug, sea_query::Iden)]
+/// Ref: https://dev.mysql.com/doc/refman/8.0/en/information-schema-collation-character-set-applicability-table.html
+pub enum CharacterSetFields {
+    CharacterSetName,
+    CollationName,
+}

src/mysql/query/char_set.rs

@@ -1,12 +1,14 @@
 //! To query MySQL's INFORMATION_SCHEMA
 
+mod char_set;
 mod column;
 mod constraint;
 mod index;
 mod schema;
 mod table;
 mod version;
 
+pub use char_set::*;
 pub use column::*;
 pub use constraint::*;
 pub use index::*;

src/mysql/query/mod.rs

@@ -23,4 +23,6 @@ pub enum InformationSchema {
     Statistics,
     KeyColumnUsage,
     ReferentialConstraints,
+    #[iden = "collation_character_set_applicability"]
+    CollationCharacterSet,
 }

src/mysql/query/schema.rs

@@ -1,7 +1,7 @@
 use std::rc::Rc;
 use sea_query::{Expr, Iden, Order, Query, SelectStatement};
 use crate::sqlx_types::{Row, mysql::MySqlRow};
-use super::{InformationSchema, SchemaQueryBuilder};
+use super::{InformationSchema, SchemaQueryBuilder, CharacterSetFields};
 
 #[derive(Debug, sea_query::Iden)]
 /// Ref: https://dev.mysql.com/doc/refman/8.0/en/information-schema-tables-table.html
@@ -43,13 +43,15 @@ pub struct TableQueryResult {
     pub table_name: String,
     pub engine: String,
     pub auto_increment: Option<u64>,
+    pub table_char_set: String,
     pub table_collation: String,
     pub table_comment: String,
     pub create_options: String,
 }
 
 impl SchemaQueryBuilder {
     pub fn query_tables(&self, schema: Rc<dyn Iden>) -> SelectStatement {
+        type Schema = InformationSchema;
         Query::select()
             .columns(vec![
                 TablesFields::TableName,
@@ -59,7 +61,13 @@ impl SchemaQueryBuilder {
                 TablesFields::TableComment,
                 TablesFields::CreateOptions,
             ])
-            .from((InformationSchema::Schema, InformationSchema::Tables))
+            .column((Schema::CollationCharacterSet, CharacterSetFields::CharacterSetName))
+            .from((Schema::Schema, Schema::Tables))
+            .left_join(
+                (Schema::Schema, Schema::CollationCharacterSet),
+                Expr::tbl(Schema::CollationCharacterSet, CharacterSetFields::CollationName)
+                    .equals(Schema::Tables, TablesFields::TableCollation)
+            )
             .and_where(Expr::col(TablesFields::TableSchema).eq(schema.to_string()))
             .and_where(Expr::col(TablesFields::TableType).eq(TableType::BaseTable.to_string()))
             .order_by(TablesFields::TableName, Order::Asc)
@@ -77,6 +85,7 @@ impl From<&MySqlRow> for TableQueryResult {
             table_collation: row.get(3),
             table_comment: row.get(4),
             create_options: row.get(5),
+            table_char_set: row.get(6),
         }
     }
 }

src/mysql/query/table.rs

@@ -1,12 +1,12 @@
 #[macro_export]
-#[cfg(feature = "debug_print")]
+#[cfg(feature = "debug-print")]
 macro_rules! debug_print {
     ($( $args:expr ),*) => { println!( $( $args ),* ); }
 }
 
 #[macro_export]
 // Non-debug version
-#[cfg(not(feature = "debug_print"))]
+#[cfg(not(feature = "debug-print"))]
 macro_rules! debug_print {
     ($( $args:expr ),*) => {}
 }