From: donkopotamus <derek.harland@finq.co.nz>
Date: Thu, 16 Jan 2014 22:00:24 +0000 (+1300)
Subject: Bug Fix: Stop generating bad sql if an empty UniqueConstraint() is given
X-Git-Tag: rel_0_9_2~53^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf8e5e3cf5b0e1be05a611c8828690acfcd2b9fa;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Bug Fix: Stop generating bad sql if an empty UniqueConstraint() is given
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index c024b62304..6c942b270a 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1069,6 +1069,8 @@ class MSDDLCompiler(compiler.DDLCompiler):
         return text
 
     def visit_unique_constraint(self, constraint):
+        if len(constraint) == 0:
+            return ''
         text = ""
         if constraint.name is not None:
             text += "CONSTRAINT %s " % \
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index ade3c623af..5c5bfad551 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -2511,6 +2511,8 @@ class DDLCompiler(Compiled):
         return preparer.format_table(table)
 
     def visit_unique_constraint(self, constraint):
+        if len(constraint) == 0:
+            return ''
         text = ""
         if constraint.name is not None:
             text += "CONSTRAINT %s " % \
diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py
index 393bcd4480..cb4b73ec8b 100644
--- a/test/sql/test_constraints.py
+++ b/test/sql/test_constraints.py
@@ -544,6 +544,28 @@ class ConstraintCompilationTest(fixtures.TestBase, AssertsCompiledSQL):
                 "FOREIGN KEY(foo_bar) REFERENCES foo (bar))"
         )
 
+    def test_empty_pkc(self):
+        # test that an empty primary key is ignored
+        metadata = MetaData()
+        tbl = Table('test', metadata,
+                    Column('x', Integer, autoincrement=False),
+                    Column('y', Integer, autoincrement=False),
+                    PrimaryKeyConstraint())
+        self.assert_compile(schema.CreateTable(tbl),
+                            "CREATE TABLE test (x INTEGER, y INTEGER)"
+                            )
+
+    def test_empty_uc(self):
+        # test that an empty constraint is ignored
+        metadata = MetaData()
+        tbl = Table('test', metadata,
+                    Column('x', Integer, autoincrement=False),
+                    Column('y', Integer, autoincrement=False),
+                    UniqueConstraint())
+        self.assert_compile(schema.CreateTable(tbl),
+                            "CREATE TABLE test (x INTEGER, y INTEGER)"
+                            )
+
     def test_deferrable_column_check(self):
         t = Table('tbl', MetaData(),
                   Column('a', Integer),