Merge pull request #193 from SeaQL/table-ref-db-prefix

Add `TableRef::DatabaseSchemaTable`
SeaQL · Dec 7, 2021 · e355849 · e355849
2 parents ce38628 + 1ff761d
commit e355849
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 1 deletion.
diff --git a/src/backend/postgres/query.rs b/src/backend/postgres/query.rs
@@ -105,14 +105,30 @@ impl QueryBuilder for PostgresQueryBuilder {
                 write!(sql, ".").unwrap();
                 table.prepare(sql, self.quote());
             }
+            TableRef::DatabaseSchemaTable(database, schema, table) => {
+                database.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                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)
+            TableRef::DatabaseSchemaTableAlias(database, schema, table, alias) => {
+                database.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                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/query_builder.rs b/src/backend/query_builder.rs
@@ -431,6 +431,11 @@ pub trait QueryBuilder: QuotedBuilder {
             TableRef::SchemaTable(_, table) => {
                 table.prepare(sql, self.quote());
             }
+            TableRef::DatabaseSchemaTable(database, _, table) => {
+                database.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+            }
             TableRef::TableAlias(iden, alias) => {
                 iden.prepare(sql, self.quote());
                 write!(sql, " AS ").unwrap();
@@ -441,6 +446,13 @@ pub trait QueryBuilder: QuotedBuilder {
                 write!(sql, " AS ").unwrap();
                 alias.prepare(sql, self.quote());
             }
+            TableRef::DatabaseSchemaTableAlias(database, _, table, alias) => {
+                database.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+                write!(sql, " AS ").unwrap();
+                alias.prepare(sql, self.quote());
+            }
             TableRef::SubQuery(query, alias) => {
                 write!(sql, "(").unwrap();
                 self.prepare_select_statement(query, sql, collector);

diff --git a/src/query/select.rs b/src/query/select.rs
@@ -525,6 +525,28 @@ impl SelectStatement {
     ///     r#"SELECT `font_size` FROM `glyph`"#
     /// );
     /// ```
+    ///
+    /// ```
+    /// use sea_query::{tests_cfg::*, *};
+    ///
+    /// let query = Query::select()
+    ///     .column(Char::FontSize)
+    ///     .from((Alias::new("database"), Char::Table, Glyph::Table))
+    ///     .to_owned();
+    ///
+    /// assert_eq!(
+    ///     query.to_string(MysqlQueryBuilder),
+    ///     r#"SELECT `font_size` FROM `database`.`glyph`"#
+    /// );
+    /// assert_eq!(
+    ///     query.to_string(PostgresQueryBuilder),
+    ///     r#"SELECT "font_size" FROM "database"."character"."glyph""#
+    /// );
+    /// assert_eq!(
+    ///     query.to_string(SqliteQueryBuilder),
+    ///     r#"SELECT `font_size` FROM `database`.`glyph`"#
+    /// );
+    /// ```
     pub fn from<R>(&mut self, tbl_ref: R) -> &mut Self
     where
         R: IntoTableRef,

diff --git a/src/types.rs b/src/types.rs
@@ -72,10 +72,19 @@ pub trait IntoColumnRef {
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone)]
 pub enum TableRef {
+    /// Table identifier without any schema / database prefix
     Table(DynIden),
+    /// Table identifier with schema (Postgres only) prefix
     SchemaTable(DynIden, DynIden),
+    /// Table identifier with database and schema (Postgres only) prefix
+    DatabaseSchemaTable(DynIden, DynIden, DynIden),
+    /// Table identifier with alias
     TableAlias(DynIden, DynIden),
+    /// Table identifier with schema (Postgres only) prefix and alias
     SchemaTableAlias(DynIden, DynIden, DynIden),
+    /// Table identifier with database and schema (Postgres only) prefix and alias
+    DatabaseSchemaTableAlias(DynIden, DynIden, DynIden, DynIden),
+    /// Subquery with alias
     SubQuery(SelectStatement, DynIden),
 }
 
@@ -278,6 +287,17 @@ where
     }
 }
 
+impl<S: 'static, T: 'static, U: 'static> IntoTableRef for (S, T, U)
+where
+    S: IntoIden,
+    T: IntoIden,
+    U: IntoIden,
+{
+    fn into_table_ref(self) -> TableRef {
+        TableRef::DatabaseSchemaTable(self.0.into_iden(), self.1.into_iden(), self.2.into_iden())
+    }
+}
+
 impl TableRef {
     /// Add or replace the current alias
     pub fn alias<A: 'static>(self, alias: A) -> Self
@@ -290,9 +310,15 @@ impl TableRef {
             Self::SchemaTable(schema, table) => {
                 Self::SchemaTableAlias(schema, table, alias.into_iden())
             }
+            Self::DatabaseSchemaTable(database, schema, table) => {
+                Self::DatabaseSchemaTableAlias(database, schema, table, alias.into_iden())
+            }
             Self::SchemaTableAlias(schema, table, _) => {
                 Self::SchemaTableAlias(schema, table, alias.into_iden())
             }
+            Self::DatabaseSchemaTableAlias(database, schema, table, _) => {
+                Self::DatabaseSchemaTableAlias(database, schema, table, alias.into_iden())
+            }
             Self::SubQuery(statement, _) => Self::SubQuery(statement, alias.into_iden()),
         }
     }