From 5ce214c7d43a0a0f57785a512272ec2102139fa2 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 2 Feb 2007 18:58:11 +0000 Subject: - sequences on a non-pk column will properly fire off on INSERT for PG/oracle --- lib/sqlalchemy/databases/oracle.py | 5 +++++ lib/sqlalchemy/databases/postgres.py | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index b5bd72e8f..8730ecdb1 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -349,6 +349,11 @@ class OracleCompiler(ansisql.ANSICompiler): self._outertable = None self.visit_compound(self.wheres[join]) + + def visit_insert_sequence(self, column, sequence, parameters): + """this is the 'sequence' equivalent to ANSICompiler's 'visit_insert_column_default' which ensures + that the column is present in the generated column list""" + parameters.setdefault(column.key, None) def visit_alias(self, alias): """oracle doesnt like 'FROM table AS alias'. is the AS standard SQL??""" diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index 3fea2e1a5..74b23d8f9 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -456,13 +456,15 @@ class PGDialect(ansisql.ANSIDialect): class PGCompiler(ansisql.ANSICompiler): def visit_insert_column(self, column, parameters): - # Postgres advises against OID usage and turns it off in 8.1, - # effectively making cursor.lastrowid - # useless, effectively making reliance upon SERIAL useless. - # so all column primary key inserts must be explicitly present + # all column primary key inserts must be explicitly present if column.primary_key: parameters[column.key] = None + def visit_insert_sequence(self, column, sequence, parameters): + """this is the 'sequence' equivalent to ANSICompiler's 'visit_insert_column_default' which ensures + that the column is present in the generated column list""" + parameters.setdefault(column.key, None) + def limit_clause(self, select): text = "" if select.limit is not None: -- cgit v1.2.1