From: Jason Kirtland <jek@discorporate.us>
Date: Wed, 1 Aug 2007 00:12:42 +0000 (+0000)
Subject: Promoted format_table_seq from mysql to ansisql.  Formats a fully qualified table... 
X-Git-Tag: rel_0_4beta1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4130498c08552242797a698309af43ed5fff50c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Promoted format_table_seq from mysql to ansisql.  Formats a fully qualified table reference as a quoted sequence, suitable for '.'.joining or whatever.  [ticket:666]
---

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 22227d56a8..01e0a3c9d3 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -1072,4 +1072,18 @@ class ANSIIdentifierPreparer(object):
         
         return self.format_column(column, use_table=True, name=column_name, table_name=table_name)
 
+
+    def format_table_seq(self, table, use_schema=True):
+        """Format table name and schema as a tuple."""
+
+        # Dialects with more levels in their fully qualified references
+        # ('database', 'owner', etc.) could override this and return
+        # a longer sequence.
+
+        if use_schema and getattr(table, 'schema', None):
+            return (self.quote_identifier(table.schema),
+                    self.format_table(table, use_schema=False))
+        else:
+            return (self.format_table(table, use_schema=False), )
+
 dialect = ANSIDialect
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index d25d3d041c..331b672bdf 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1535,16 +1535,6 @@ class MySQLIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
         # just leave everything as-is.
         return value
 
-    def format_table_seq(self, table, use_schema=True):
-        """Format table name and schema as a tuple."""
-
-        if use_schema and getattr(table, 'schema', None):
-            return (self.quote_identifier(table.schema),
-                    self.format_table(table, use_schema=False))
-        else:
-            return (self.format_table(table, use_schema=False), )
-
-
 class MySQLCharsetOnConnect(object):
     """Use an alternate connection character set automatically."""