diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-02-17 02:39:28 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-02-17 02:39:28 +0000 |
| commit | 3e5eeb064a471269041cb12ad95f413ff9aee9c6 (patch) | |
| tree | 89790e6fce6b42f4c38067cd8bde4d9507e9d5ca /lib/sqlalchemy | |
| parent | 123498ee1fe869ac5c5630d20fbe871bf8232956 (diff) | |
| download | sqlalchemy-3e5eeb064a471269041cb12ad95f413ff9aee9c6.tar.gz | |
- moved change for [ticket:466] to ansisql, since thats the syntax for all databases.
the change is across all dialects, not just oracle
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/ansisql.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 974319845..6cb57e148 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -746,9 +746,10 @@ class ANSISchemaGenerator(ANSISchemaBase): def visit_primary_key_constraint(self, constraint): if len(constraint) == 0: return - self.append(", \n\tPRIMARY KEY ") + self.append(", \n\t") if constraint.name is not None: - self.append("%s " % constraint.name) + self.append("CONSTRAINT %s " % constraint.name) + self.append("PRIMARY KEY ") self.append("(%s)" % (string.join([self.preparer.format_column(c) for c in constraint],', '))) def supports_alter(self): diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 2d77946c4..5346c30da 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -485,14 +485,6 @@ class OracleSchemaGenerator(ansisql.ANSISchemaGenerator): self.append("CREATE SEQUENCE %s" % self.preparer.format_sequence(sequence)) self.execute() - def visit_primary_key_constraint(self, constraint): - if len(constraint) == 0: - return - self.append(", \n\t") - if constraint.name is not None: - self.append("CONSTRAINT %s " % constraint.name) - self.append("PRIMARY KEY ") - self.append("(%s)" % (string.join([self.preparer.format_column(c) for c in constraint],', '))) class OracleSchemaDropper(ansisql.ANSISchemaDropper): def visit_sequence(self, sequence): |