From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 14 Jul 2014 23:16:11 +0000 (-0400)
Subject: - Fixed a regression from 0.9.5 caused by :ticket:`3025` where the
X-Git-Tag: rel_0_9_7~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9a59575ebfd827d85a56d33b994416512ec82cd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed a regression from 0.9.5 caused by :ticket:`3025` where the
query used to determine "default schema" is invalid in SQL Server 2000.
For SQL Server 2000 we go back to defaulting to the "schema name"
parameter of the dialect, which is configurable but defaults
to 'dbo'. fixes #3025
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 22a4339e80..5897f922c1 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,16 @@
     :version: 0.9.7
     :released:
 
+    .. change::
+        :tags: bug, mssql
+        :tickets: 3025
+
+        Fixed a regression from 0.9.5 caused by :ticket:`3025` where the
+        query used to determine "default schema" is invalid in SQL Server 2000.
+        For SQL Server 2000 we go back to defaulting to the "schema name"
+        parameter of the dialect, which is configurable but defaults
+        to 'dbo'.
+
     .. change::
         :tags: bug, orm
         :tickets: 3083, 2736
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 80df645dce..81a9e3a5b3 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1347,6 +1347,9 @@ class MSDialect(default.DefaultDialect):
             self.supports_multivalues_insert = True
 
     def _get_default_schema_name(self, connection):
+        if self.server_version_info < MS_2005_VERSION:
+            return self.schema_name
+
         query = sql.text("""
             SELECT default_schema_name FROM
             sys.database_principals