diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/databases/firebird.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/postgres.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 13 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 15 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 12 |
6 files changed, 37 insertions, 12 deletions
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py index 55eb9a45b..5316f528d 100644 --- a/lib/sqlalchemy/databases/firebird.py +++ b/lib/sqlalchemy/databases/firebird.py @@ -142,7 +142,8 @@ class FBDialect(default.DefaultDialect): supports_sane_rowcount = False supports_sane_multi_rowcount = False max_identifier_length = 31 - preexecute_sequences = True + preexecute_pk_sequences = True + supports_pk_autoincrement = False def __init__(self, type_conv=200, concurrency_level=1, **kwargs): default.DefaultDialect.__init__(self, **kwargs) diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 2c5eacdbd..f4f8aa689 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -237,7 +237,8 @@ class OracleDialect(default.DefaultDialect): max_identifier_length = 30 supports_sane_rowcount = True supports_sane_multi_rowcount = False - preexecute_sequences = True + preexecute_pk_sequences = True + supports_pk_autoincrement = False def __init__(self, use_ansi=True, auto_setinputsizes=True, auto_convert_lobs=True, threaded=True, allow_twophase=True, **kwargs): default.DefaultDialect.__init__(self, default_paramstyle='named', **kwargs) diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index ddf6a6b9c..018074b67 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -279,7 +279,8 @@ class PGDialect(default.DefaultDialect): max_identifier_length = 63 supports_sane_rowcount = True supports_sane_multi_rowcount = False - preexecute_sequences = True + preexecute_pk_sequences = True + supports_pk_autoincrement = False def __init__(self, use_oids=False, server_side_cursors=False, **kwargs): default.DefaultDialect.__init__(self, default_paramstyle='pyformat', **kwargs) diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 5f3975684..131f50540 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -12,9 +12,9 @@ higher-level statement-construction, connection-management, execution and result contexts. """ +import StringIO, sys from sqlalchemy import exceptions, schema, util, types, logging from sqlalchemy.sql import expression, visitors -import StringIO, sys class Dialect(object): @@ -79,9 +79,14 @@ class Dialect(object): Indicate whether the dialect properly implements rowcount for ``UPDATE`` and ``DELETE`` statements when executed via executemany. - preexecute_sequences - Indicate if the dialect should pre-execute sequences on primary key columns during an INSERT, - if it's desired that the new row's primary key be available after execution. + preexecute_pk_sequences + Indicate if the dialect should pre-execute sequences on primary key + columns during an INSERT, if it's desired that the new row's primary key + be available after execution. + + supports_pk_autoincrement + Indicates if the dialect should allow the database to passively assign + a primary key column value. """ def create_connect_args(self, url): diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 1a15c8b8d..d826b97fa 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -31,7 +31,8 @@ class DefaultDialect(base.Dialect): max_identifier_length = 9999 supports_sane_rowcount = True supports_sane_multi_rowcount = True - preexecute_sequences = False + preexecute_pk_sequences = False + supports_pk_autoincrement = True def __init__(self, convert_unicode=False, encoding='utf-8', default_paramstyle='named', paramstyle=None, dbapi=None, **kwargs): self.convert_unicode = convert_unicode @@ -47,7 +48,17 @@ class DefaultDialect(base.Dialect): self.paramstyle = default_paramstyle self.positional = self.paramstyle in ('qmark', 'format', 'numeric') self.identifier_preparer = self.preparer(self) - + + # preexecute_sequences was renamed preexecute_pk_sequences. If a + # subclass has the older property, proxy the new name to the subclass's + # property. + # TODO: remove @ 0.5.0 + if (hasattr(self, 'preexecute_sequences') and + isinstance(getattr(type(self), 'preexecute_pk_sequences'), bool)): + setattr(type(self), 'preexecute_pk_sequences', + property(lambda s: s.preexecute_sequences, doc=( + "Proxy to deprecated preexecute_sequences attribute."))) + def dbapi_type_map(self): # most DB-APIs have problems with this (such as, psycocpg2 types # are unhashable). So far Oracle can return it. diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 5572c2ed4..f2627eb85 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -674,9 +674,15 @@ class DefaultCompiler(engine.Compiled, visitors.ClauseVisitor): values.append((c, value)) elif isinstance(c, schema.Column): if self.isinsert: - if c.primary_key and self.dialect.preexecute_sequences and not self.inline: - values.append((c, create_bind_param(c, None))) - self.prefetch.add(c) + if (c.primary_key and self.dialect.preexecute_pk_sequences + and not self.inline): + if (((isinstance(c.default, schema.Sequence) and + not c.default.optional) or + not self.dialect.supports_pk_autoincrement) or + (c.default is not None and + not isinstance(c.default, schema.Sequence))): + values.append((c, create_bind_param(c, None))) + self.prefetch.add(c) elif isinstance(c.default, schema.ColumnDefault): if isinstance(c.default.arg, sql.ClauseElement): values.append((c, self.process(c.default.arg.self_group()))) |