Merge pull request #186 from josh-codes/sea-query-change-type-into-ta…

…ble-ref removed `'static` and inplace, added the type `IntoTableRef`.
SeaQL · Nov 17, 2021 · 82ab40a · 82ab40a
2 parents e05a851 + 27d0150
commit 82ab40a
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 25 deletions.
diff --git a/src/backend/postgres/query.rs b/src/backend/postgres/query.rs
@@ -92,4 +92,27 @@ impl QueryBuilder for PostgresQueryBuilder {
             _ => QueryBuilder::prepare_simple_expr_common(self, simple_expr, sql, collector),
         }
     }
+
+    fn prepare_table_ref(
+        &self,
+        table_ref: &TableRef,
+        sql: &mut SqlWriter,
+        collector: &mut dyn FnMut(Value),
+    ) {
+        match table_ref {
+            TableRef::SchemaTable(schema, table) => {
+                schema.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+            }
+            TableRef::SchemaTableAlias(schema, table, alias) => {
+                schema.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+                write!(sql, " AS ").unwrap();
+                alias.prepare(sql, self.quote());
+            }
+            _ => QueryBuilder::prepare_table_ref_common(self, table_ref, sql, collector)
+        }
+    }
 }
diff --git a/src/backend/postgres/table.rs b/src/backend/postgres/table.rs
@@ -1,6 +1,17 @@
 use super::*;
 
 impl TableBuilder for PostgresQueryBuilder {
+    fn prepare_table_ref(&self, table_ref: &TableRef, sql: &mut SqlWriter) {
+        match table_ref {
+            TableRef::SchemaTable(schema, table) => {
+                schema.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+            }
+            _ => TableBuilder::prepare_table_ref_common(self, table_ref, sql),
+        }
+    }
+
     fn prepare_column_def(&self, column_def: &ColumnDef, sql: &mut SqlWriter) {
         column_def.name.prepare(sql, '"');
 

diff --git a/src/backend/query_builder.rs b/src/backend/query_builder.rs
@@ -414,24 +414,29 @@ pub trait QueryBuilder: QuotedBuilder {
         table_ref: &TableRef,
         sql: &mut SqlWriter,
         collector: &mut dyn FnMut(Value),
+    ) {
+        QueryBuilder::prepare_table_ref_common(self, table_ref, sql, collector);
+    }
+
+    fn prepare_table_ref_common(
+        &self,
+        table_ref: &TableRef,
+        sql: &mut SqlWriter,
+        collector: &mut dyn FnMut(Value),
     ) {
         match table_ref {
             TableRef::Table(iden) => {
                 iden.prepare(sql, self.quote());
             }
-            TableRef::SchemaTable(schema, table) => {
-                schema.prepare(sql, self.quote());
-                write!(sql, ".").unwrap();
+            TableRef::SchemaTable(_, table) => {
                 table.prepare(sql, self.quote());
             }
             TableRef::TableAlias(iden, alias) => {
                 iden.prepare(sql, self.quote());
                 write!(sql, " AS ").unwrap();
                 alias.prepare(sql, self.quote());
             }
-            TableRef::SchemaTableAlias(schema, table, alias) => {
-                schema.prepare(sql, self.quote());
-                write!(sql, ".").unwrap();
+            TableRef::SchemaTableAlias(_, table, alias) => {
                 table.prepare(sql, self.quote());
                 write!(sql, " AS ").unwrap();
                 alias.prepare(sql, self.quote());

diff --git a/src/backend/table_builder.rs b/src/backend/table_builder.rs
@@ -9,8 +9,8 @@ pub trait TableBuilder: IndexBuilder + ForeignKeyBuilder + QuotedBuilder {
             write!(sql, "IF NOT EXISTS ").unwrap();
         }
 
-        if let Some(table) = &create.table {
-            table.prepare(sql, self.quote());
+        if let Some(table_ref) = &create.table {
+            self.prepare_table_ref(table_ref, sql);
         }
 
         write!(sql, " ( ").unwrap();
@@ -48,6 +48,23 @@ pub trait TableBuilder: IndexBuilder + ForeignKeyBuilder + QuotedBuilder {
         }
     }
 
+    /// Translate [`TableRef`] into SQL statement.
+    fn prepare_table_ref(&self, table_ref: &TableRef, sql: &mut SqlWriter) {
+        self.prepare_table_ref_common(table_ref, sql);
+    }
+
+    fn prepare_table_ref_common(&self, table_ref: &TableRef, sql: &mut SqlWriter) {
+        match table_ref {
+            TableRef::Table(table) => {
+                table.prepare(sql, self.quote());
+            }
+            TableRef::SchemaTable(_, table) => {
+                table.prepare(sql, self.quote());
+            }
+            _ => panic!("Not supported"),
+        }
+    }
+
     /// Translate [`ColumnDef`] into SQL statement.
     fn prepare_column_def(&self, column_def: &ColumnDef, sql: &mut SqlWriter);
 
@@ -86,7 +103,7 @@ pub trait TableBuilder: IndexBuilder + ForeignKeyBuilder + QuotedBuilder {
             if !first {
                 write!(sql, ", ").unwrap();
             }
-            table.prepare(sql, self.quote());
+            self.prepare_table_ref(table, sql);
             false
         });
 

diff --git a/src/query/select.rs b/src/query/select.rs
@@ -514,15 +514,15 @@ impl SelectStatement {
     ///
     /// assert_eq!(
     ///     query.to_string(MysqlQueryBuilder),
-    ///     r#"SELECT `font_size` FROM `character`.`glyph`"#
+    ///     r#"SELECT `font_size` FROM `glyph`"#
     /// );
     /// assert_eq!(
     ///     query.to_string(PostgresQueryBuilder),
     ///     r#"SELECT "font_size" FROM "character"."glyph""#
     /// );
     /// assert_eq!(
     ///     query.to_string(SqliteQueryBuilder),
-    ///     r#"SELECT `font_size` FROM `character`.`glyph`"#
+    ///     r#"SELECT `font_size` FROM `glyph`"#
     /// );
     /// ```
     pub fn from<R>(&mut self, tbl_ref: R) -> &mut Self
@@ -550,15 +550,15 @@ impl SelectStatement {
     ///
     /// assert_eq!(
     ///     query.to_string(MysqlQueryBuilder),
-    ///     r#"SELECT `font_size` FROM `character`.`glyph`"#
+    ///     r#"SELECT `font_size` FROM `glyph`"#
     /// );
     /// assert_eq!(
     ///     query.to_string(PostgresQueryBuilder),
     ///     r#"SELECT "font_size" FROM "character"."glyph""#
     /// );
     /// assert_eq!(
     ///     query.to_string(SqliteQueryBuilder),
-    ///     r#"SELECT `font_size` FROM `character`.`glyph`"#
+    ///     r#"SELECT `font_size` FROM `glyph`"#
     /// );
     /// ```
     pub fn from_schema<S: 'static, T: 'static>(&mut self, schema: S, table: T) -> &mut Self
@@ -609,15 +609,15 @@ impl SelectStatement {
     ///
     /// assert_eq!(
     ///     query.to_string(MysqlQueryBuilder),
-    ///     r#"SELECT `alias`.`character` FROM `font`.`character` AS `alias`"#
+    ///     r#"SELECT `alias`.`character` FROM `character` AS `alias`"#
     /// );
     /// assert_eq!(
     ///     query.to_string(PostgresQueryBuilder),
     ///     r#"SELECT "alias"."character" FROM "font"."character" AS "alias""#
     /// );
     /// assert_eq!(
     ///     query.to_string(SqliteQueryBuilder),
-    ///     r#"SELECT `alias`.`character` FROM `font`.`character` AS `alias`"#
+    ///     r#"SELECT `alias`.`character` FROM `character` AS `alias`"#
     /// );
     /// ```
     pub fn from_as<R, A>(&mut self, tbl_ref: R, alias: A) -> &mut Self

diff --git a/src/table/column.rs b/src/table/column.rs
@@ -3,7 +3,7 @@ use crate::{types::*, value::*};
 /// Specification of a table column
 #[derive(Debug, Clone)]
 pub struct ColumnDef {
-    pub(crate) table: Option<DynIden>,
+    pub(crate) table: Option<TableRef>,
     pub(crate) name: DynIden,
     pub(crate) types: Option<ColumnType>,
     pub(crate) spec: Vec<ColumnSpec>,

diff --git a/src/table/create.rs b/src/table/create.rs
@@ -78,7 +78,7 @@ use crate::{
 /// ```
 #[derive(Debug, Clone)]
 pub struct TableCreateStatement {
-    pub(crate) table: Option<DynIden>,
+    pub(crate) table: Option<TableRef>,
     pub(crate) columns: Vec<ColumnDef>,
     pub(crate) options: Vec<TableOpt>,
     pub(crate) partitions: Vec<TablePartition>,
@@ -135,11 +135,11 @@ impl TableCreateStatement {
     }
 
     /// Set table name
-    pub fn table<T: 'static>(&mut self, table: T) -> &mut Self
+    pub fn table<T>(&mut self, table: T) -> &mut Self
     where
-        T: Iden,
+        T: IntoTableRef,
     {
-        self.table = Some(SeaRc::new(table));
+        self.table = Some(table.into_table_ref());
         self
     }
 
@@ -267,8 +267,8 @@ impl TableCreateStatement {
         self
     }
 
-    pub fn get_table_name(&self) -> Option<String> {
-        self.table.as_ref().map(|table| table.to_string())
+    pub fn get_table_name(&self) -> Option<&TableRef> {
+        self.table.as_ref()
     }
 
     pub fn get_columns(&self) -> &Vec<ColumnDef> {

diff --git a/src/table/drop.rs b/src/table/drop.rs
@@ -27,7 +27,7 @@ use crate::{backend::SchemaBuilder, prepare::*, types::*, SchemaStatementBuilder
 /// ```
 #[derive(Debug, Clone)]
 pub struct TableDropStatement {
-    pub(crate) tables: Vec<DynIden>,
+    pub(crate) tables: Vec<TableRef>,
     pub(crate) options: Vec<TableDropOpt>,
     pub(crate) if_exists: bool,
 }
@@ -58,9 +58,9 @@ impl TableDropStatement {
     /// Set table name
     pub fn table<T: 'static>(&mut self, table: T) -> &mut Self
     where
-        T: Iden,
+        T: IntoTableRef,
     {
-        self.tables.push(SeaRc::new(table));
+        self.tables.push(table.into_table_ref());
         self
     }