From: donkopotamus <derek.harland@finq.co.nz>
Date: Thu, 16 Jan 2014 21:38:31 +0000 (+1300)
Subject: Remove support for mssql_clustered on Table
X-Git-Tag: rel_0_9_2~53^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1de7259093b1a49438ab26ca9661fd6023244afe;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Remove support for mssql_clustered on Table
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index a4997d1946..213e00d79f 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -107,8 +107,8 @@ Clustered Index Support
 -----------------------
 
 The MSSQL dialect supports clustered indexes (and primary keys) via the
-``mssql_clustered`` option.  This option is available to :class:`.Index`,
-:class:`.Table` and :class:`.PrimaryKeyConstraint`.
+``mssql_clustered`` option.  This option is available to :class:`.Index`
+and :class:`.PrimaryKeyConstraint`.
 
 To generate a clustered index::
 
@@ -118,14 +118,7 @@ which renders the index as ``CREATE CLUSTERED INDEX my_index ON table (x)``.
 
 .. versionadded:: 0.8
 
-To generate a clustered primary key use either::
-
-    Table('my_table', metadata,
-          Column('x', ..., primary_key=True),
-          Column('y', ..., primary_key=True),
-          mssql_clustered=True)
-
-or::
+To generate a clustered primary key use::
 
     Table('my_table', metadata,
           Column('x', ...),
@@ -1057,11 +1050,8 @@ class MSDDLCompiler(compiler.DDLCompiler):
                     self.preparer.format_constraint(constraint)
         text += "PRIMARY KEY "
 
-        # we allow for mssql_clustered to have been specified directly on a
-        # PrimaryKeyConstraint, or specified upon the table object.  The latter allows
-        # users to tag columns with primary_key=True and still achieve clustering.
-        if (constraint.kwargs.get("mssql_clustered") or
-            constraint.table.kwargs.get("mssql_clustered")):
+        # support clustered option
+        if constraint.kwargs.get("mssql_clustered"):
             text += "CLUSTERED "
 
         text += "(%s)" % ', '.join(self.preparer.quote(c.name)
diff --git a/test/dialect/mssql/test_compiler.py b/test/dialect/mssql/test_compiler.py
index 40ca603a02..f1cf6924cd 100644
--- a/test/dialect/mssql/test_compiler.py
+++ b/test/dialect/mssql/test_compiler.py
@@ -510,18 +510,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
                             "CREATE TABLE test (id INTEGER NOT NULL IDENTITY(1,1))"
                             )
 
-    def test_table_pkc_clustering_1(self):
-        metadata = MetaData()
-        tbl = Table('test', metadata,
-                    Column('x', Integer, primary_key=True, autoincrement=False),
-                    Column('y', Integer, primary_key=True, autoincrement=False),
-                    mssql_clustered=True)
-        self.assert_compile(schema.CreateTable(tbl),
-                            "CREATE TABLE test (x INTEGER NOT NULL, y INTEGER NOT NULL, "
-                            "PRIMARY KEY CLUSTERED (x, y))"
-                            )
-
-    def test_table_pkc_clustering_2(self):
+    def test_table_pkc_clustering(self):
         metadata = MetaData()
         tbl = Table('test', metadata,
                     Column('x', Integer, autoincrement=False),