Add TableRef::DatabaseTable

SeaQL · Nov 29, 2021 · 1f2c7db · 1f2c7db
1 parent ff10e85
commit 1f2c7db
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
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::DatabaseTable(db, table) => {
+                db.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::DatabaseTableAlias(db, table, alias) => {
+                db.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/backend/table_builder.rs b/src/backend/table_builder.rs
@@ -61,6 +61,11 @@ pub trait TableBuilder: IndexBuilder + ForeignKeyBuilder + QuotedBuilder {
             TableRef::SchemaTable(_, table) => {
                 table.prepare(sql, self.quote());
             }
+            TableRef::DatabaseTable(db, table) => {
+                db.prepare(sql, self.quote());
+                write!(sql, ".").unwrap();
+                table.prepare(sql, self.quote());
+            }
             _ => panic!("Not supported"),
         }
     }

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 (for Postgres) prefix
     SchemaTable(DynIden, DynIden),
+    /// Table identifier with database (for MySQL and SQLite) prefix
+    DatabaseTable(DynIden, DynIden),
+    /// Table identifier with alias
     TableAlias(DynIden, DynIden),
+    /// Table identifier with schema (for Postgres) prefix and alias
     SchemaTableAlias(DynIden, DynIden, DynIden),
+    /// Table identifier with database (for MySQL and SQLite) prefix and alias
+    DatabaseTableAlias(DynIden, DynIden, DynIden),
+    /// Subquery with alias
     SubQuery(SelectStatement, DynIden),
 }
 
@@ -290,9 +299,15 @@ impl TableRef {
             Self::SchemaTable(schema, table) => {
                 Self::SchemaTableAlias(schema, table, alias.into_iden())
             }
+            Self::DatabaseTable(schema, table) => {
+                Self::DatabaseTableAlias(schema, table, alias.into_iden())
+            }
             Self::SchemaTableAlias(schema, table, _) => {
                 Self::SchemaTableAlias(schema, table, alias.into_iden())
             }
+            Self::DatabaseTableAlias(schema, table, _) => {
+                Self::DatabaseTableAlias(schema, table, alias.into_iden())
+            }
             Self::SubQuery(statement, _) => Self::SubQuery(statement, alias.into_iden()),
         }
     }