summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/mssql.py18
-rw-r--r--lib/sqlalchemy/databases/mysql.py7
-rw-r--r--lib/sqlalchemy/databases/postgres.py22
3 files changed, 18 insertions, 29 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 013e78c6a..a2d4ac36e 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -572,10 +572,8 @@ class MSSQLDialect_pymssql(MSSQLDialect):
del keys['port']
return [[], keys]
- def get_disconnect_checker(self):
- def disconnect_checker(e):
- return isinstance(e, self.dbapi.DatabaseError) and "Error 10054" in str(e)
- return disconnect_checker
+ def is_disconnect(self, e):
+ return isinstance(e, self.dbapi.DatabaseError) and "Error 10054" in str(e)
## This code is leftover from the initial implementation, for reference
@@ -636,10 +634,8 @@ class MSSQLDialect_pyodbc(MSSQLDialect):
connectors.append ("TrustedConnection=Yes")
return [[";".join (connectors)], {}]
- def get_disconnect_checker(self):
- def disconnect_checker(e):
- return isinstance(e, self.dbapi.Error) and '[08S01]' in e.args[1]
- return disconnect_checker
+ def is_disconnect(self, e):
+ return isinstance(e, self.dbapi.Error) and '[08S01]' in e.args[1]
class MSSQLDialect_adodbapi(MSSQLDialect):
@@ -671,10 +667,8 @@ class MSSQLDialect_adodbapi(MSSQLDialect):
connectors.append("Integrated Security=SSPI")
return [[";".join (connectors)], {}]
- def get_disconnect_checker(self):
- def disconnect_checker(e):
- return isinstance(e, self.dbapi.adodbapi.DatabaseError) and "'connection failure'" in str(e)
- return disconnect_checker
+ def is_disconnect(self, e):
+ return isinstance(e, self.dbapi.adodbapi.DatabaseError) and "'connection failure'" in str(e)
dialect_mapping = {
'pymssql': MSSQLDialect_pymssql,
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 7ea98e92f..03297cd68 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -342,11 +342,8 @@ class MySQLDialect(ansisql.ANSIDialect):
except:
pass
- def get_disconnect_checker(self):
- def disconnect_checker(e):
- return isinstance(e, self.dbapi.OperationalError) and e.args[0] in (2006, 2014)
- return disconnect_checker
-
+ def is_disconnect(self, e):
+ return isinstance(e, self.dbapi.OperationalError) and e.args[0] in (2006, 2014)
def get_default_schema_name(self):
if not hasattr(self, '_default_schema_name'):
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a26ef76b6..6facde936 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -338,18 +338,16 @@ class PGDialect(ansisql.ANSIDialect):
cursor = connection.execute('''SELECT relname FROM pg_class WHERE relkind = 'S' AND relnamespace IN ( SELECT oid FROM pg_namespace WHERE nspname NOT LIKE 'pg_%%' AND nspname != 'information_schema' AND relname = %(seqname)s);''', {'seqname': sequence_name})
return bool(not not cursor.rowcount)
- def get_disconnect_checker(self):
- def disconnect_checker(e):
- if isinstance(e, self.dbapi.OperationalError):
- return 'closed the connection' in str(e) or 'connection not open' in str(e)
- elif isinstance(e, self.dbapi.InterfaceError):
- return 'connection already closed' in str(e)
- elif isinstance(e, self.dbapi.ProgrammingError):
- # yes, it really says "losed", not "closed"
- return "losed the connection unexpectedly" in str(e)
- else:
- return False
- return disconnect_checker
+ def is_disconnect(self, e):
+ if isinstance(e, self.dbapi.OperationalError):
+ return 'closed the connection' in str(e) or 'connection not open' in str(e)
+ elif isinstance(e, self.dbapi.InterfaceError):
+ return 'connection already closed' in str(e)
+ elif isinstance(e, self.dbapi.ProgrammingError):
+ # yes, it really says "losed", not "closed"
+ return "losed the connection unexpectedly" in str(e)
+ else:
+ return False
def reflecttable(self, connection, table):
if self.version == 2: