summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/firebird.py2
-rw-r--r--lib/sqlalchemy/databases/mssql.py4
-rw-r--r--lib/sqlalchemy/databases/mysql.py2
-rw-r--r--lib/sqlalchemy/databases/oracle.py2
-rw-r--r--lib/sqlalchemy/databases/sqlite.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index 6af6d6d87..5a25b12db 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -167,7 +167,7 @@ class FBDialect(ansisql.ANSIDialect):
def preparer(self):
return FBIdentifierPreparer(self)
- def has_table(self, connection, table_name):
+ def has_table(self, connection, table_name, schema=None):
tblqry = """
SELECT count(*)
FROM RDB$RELATIONS R
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 6d351d0fb..fbb89de1a 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -345,10 +345,10 @@ class MSSQLDialect(ansisql.ANSIDialect):
c.name = c.name.upper()
return t
- def has_table(self, connection, tablename):
+ def has_table(self, connection, tablename, schema=None):
import sqlalchemy.databases.information_schema as ischema
- current_schema = self.get_default_schema_name()
+ current_schema = schema or self.get_default_schema_name()
columns = self.uppercase_table(ischema.columns)
s = sql.select([columns],
current_schema
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index c09d02756..c6bf2695f 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -335,7 +335,7 @@ class MySQLDialect(ansisql.ANSIDialect):
def dbapi(self):
return self.module
- def has_table(self, connection, table_name):
+ def has_table(self, connection, table_name, schema=None):
cursor = connection.execute("show table status like '" + table_name + "'")
return bool( not not cursor.rowcount )
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 7221d5662..2db909592 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -211,7 +211,7 @@ class OracleDialect(ansisql.ANSIDialect):
return OracleDefaultRunner(engine, proxy)
- def has_table(self, connection, table_name):
+ def has_table(self, connection, table_name, schema=None):
cursor = connection.execute("""select table_name from all_tables where table_name=:name""", {'name':table_name.upper()})
return bool( cursor.fetchone() is not None )
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index dda488f9c..2ab3c0d5a 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -171,7 +171,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
def dbapi(self):
return sqlite
- def has_table(self, connection, table_name):
+ def has_table(self, connection, table_name, schema=None):
cursor = connection.execute("PRAGMA table_info(" + table_name + ")", {})
row = cursor.fetchone()