- 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 a2fc84b120635c68606f9d8fbc7f71ce1fa71d2b..8be2346f6eb75db39edf2266ef3801038d3e68c4 100644 (file)
--- 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 eebd35405b9575bb627fd754fcde79fa392fd9e0..473f7df06de99a7da169d1dbee1d06439463f7f1 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1365,6 +1365,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