diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-27 14:46:44 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-27 14:46:44 -0400 |
| commit | 035ec314f63bd03de11eeac7c52c852674c7ce29 (patch) | |
| tree | cd53eee0f07679d98a402dffd12a7ceb00113bc7 /lib/sqlalchemy | |
| parent | b086f9a81556250ac6352e092a36e53757f36477 (diff) | |
| download | sqlalchemy-035ec314f63bd03de11eeac7c52c852674c7ce29.tar.gz | |
- Fixed concatenation of constraints when "PRIMARY KEY"
constraint gets moved to column level due to SQLite
AUTOINCREMENT keyword being rendered. [ticket:1812]
- remove some extra space in between constraint DDL
- added alias() to binary comparison test, fixing pg + mysql failures
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index ec3d7b8ac..030b45aff 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -266,7 +266,7 @@ class SQLiteDDLCompiler(compiler.DDLCompiler): c.table.kwargs.get('sqlite_autoincrement', False) and \ isinstance(c.type, sqltypes.Integer) and \ not c.foreign_keys: - return '' + return None return super(SQLiteDDLCompiler, self).\ visit_primary_key_constraint(constraint) diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 0e5f3499e..b4992eec3 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1177,7 +1177,7 @@ class DDLCompiler(engine.Compiled): preparer = self.preparer text = "CREATE " if index.unique: - text += "UNIQUE " + text += "UNIQUE " text += "INDEX %s ON %s (%s)" \ % (preparer.quote(self._validate_identifier(index.name, True), index.quote), preparer.format_table(index.table), @@ -1262,7 +1262,7 @@ class DDLCompiler(engine.Compiled): return text def visit_column_check_constraint(self, constraint): - text = " CHECK (%s)" % constraint.sqltext + text = "CHECK (%s)" % constraint.sqltext text += self.define_constraint_deferrability(constraint) return text @@ -1299,8 +1299,8 @@ class DDLCompiler(engine.Compiled): def visit_unique_constraint(self, constraint): text = "" if constraint.name is not None: - text += "CONSTRAINT %s" % self.preparer.format_constraint(constraint) - text += " UNIQUE (%s)" % (', '.join(self.preparer.quote(c.name, c.quote) for c in constraint)) + text += "CONSTRAINT %s " % self.preparer.format_constraint(constraint) + text += "UNIQUE (%s)" % (', '.join(self.preparer.quote(c.name, c.quote) for c in constraint)) text += self.define_constraint_deferrability(constraint) return text |