diff options
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/firebird/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py index 4043cd6c3..feca46bce 100644 --- a/lib/sqlalchemy/dialects/firebird/base.py +++ b/lib/sqlalchemy/dialects/firebird/base.py @@ -331,13 +331,13 @@ class FBIdentifierPreparer(sql.compiler.IdentifierPreparer): class FBExecutionContext(default.DefaultExecutionContext): - def fire_sequence(self, seq, proc): + def fire_sequence(self, seq, type_): """Get the next value from the sequence using ``gen_id()``.""" return self._execute_scalar( "SELECT gen_id(%s, 1) FROM rdb$database" % self.dialect.identifier_preparer.format_sequence(seq), - proc + type_ ) diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 0b0622f84..7ed4ca07e 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -593,10 +593,10 @@ class OracleIdentifierPreparer(compiler.IdentifierPreparer): class OracleExecutionContext(default.DefaultExecutionContext): - def fire_sequence(self, seq, proc): + def fire_sequence(self, seq, type_): return int(self._execute_scalar("SELECT " + self.dialect.identifier_preparer.format_sequence(seq) + - ".nextval FROM DUAL"), proc) + ".nextval FROM DUAL"), type_) class OracleDialect(default.DefaultDialect): name = 'oracle' diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 84fd96edd..7c712e8aa 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -681,21 +681,21 @@ class DropEnumType(schema._CreateDropBase): __visit_name__ = "drop_enum_type" class PGExecutionContext(default.DefaultExecutionContext): - def fire_sequence(self, seq, proc): + def fire_sequence(self, seq, type_): if not seq.optional: return self._execute_scalar(("select nextval('%s')" % \ - self.dialect.identifier_preparer.format_sequence(seq)), proc) + self.dialect.identifier_preparer.format_sequence(seq)), type_) else: return None - def get_insert_default(self, column, proc): + def get_insert_default(self, column): if column.primary_key: if (isinstance(column.server_default, schema.DefaultClause) and column.server_default.arg is not None): # pre-execute passive defaults on primary key columns return self._execute_scalar("select %s" % - column.server_default.arg, proc) + column.server_default.arg, column.type) elif column is column.table._autoincrement_column \ and (column.default is None or @@ -714,9 +714,9 @@ class PGExecutionContext(default.DefaultExecutionContext): exc = "select nextval('\"%s_%s_seq\"')" % \ (column.table.name, column.name) - return self._execute_scalar(exc, proc) + return self._execute_scalar(exc, column.type) - return super(PGExecutionContext, self).get_insert_default(column, proc) + return super(PGExecutionContext, self).get_insert_default(column) class PGDialect(default.DefaultDialect): name = 'postgresql' |