mirror of
https://github.com/sqlalchemy/sqlalchemy.git
synced 2026-05-29 03:54:43 -04:00
- Added support for rendering `SMALLSERIAL when a :class:.SmallInteger`
type is used on a primary key autoincrement column, based on server version detection of Postgresql version 9.2 or greater. [ticket:2840]
This commit is contained in:
Vendored
+8
@@ -12,6 +12,14 @@
|
||||
.. changelog::
|
||||
:version: 0.9.0
|
||||
|
||||
.. change::
|
||||
:tags: feature, postgresql
|
||||
:tickets: 2840
|
||||
|
||||
Added support for rendering ``SMALLSERIAL`` when a :class:`.SmallInteger`
|
||||
type is used on a primary key autoincrement column, based on server
|
||||
version detection of Postgresql version 9.2 or greater.
|
||||
|
||||
.. change::
|
||||
:tags: feature, mysql
|
||||
:tickets: 2817
|
||||
|
||||
@@ -1039,12 +1039,15 @@ class PGCompiler(compiler.SQLCompiler):
|
||||
|
||||
class PGDDLCompiler(compiler.DDLCompiler):
|
||||
def get_column_specification(self, column, **kwargs):
|
||||
|
||||
colspec = self.preparer.format_column(column)
|
||||
impl_type = column.type.dialect_impl(self.dialect)
|
||||
if column.primary_key and \
|
||||
column is column.table._autoincrement_column and \
|
||||
not isinstance(impl_type, sqltypes.SmallInteger) and \
|
||||
(
|
||||
self.dialect.supports_smallserial or
|
||||
not isinstance(impl_type, sqltypes.SmallInteger)
|
||||
) and (
|
||||
column.default is None or
|
||||
(
|
||||
isinstance(column.default, schema.Sequence) and
|
||||
@@ -1052,6 +1055,8 @@ class PGDDLCompiler(compiler.DDLCompiler):
|
||||
)):
|
||||
if isinstance(impl_type, sqltypes.BigInteger):
|
||||
colspec += " BIGSERIAL"
|
||||
elif isinstance(impl_type, sqltypes.SmallInteger):
|
||||
colspec += " SMALLSERIAL"
|
||||
else:
|
||||
colspec += " SERIAL"
|
||||
else:
|
||||
@@ -1330,6 +1335,7 @@ class PGDialect(default.DefaultDialect):
|
||||
|
||||
supports_native_enum = True
|
||||
supports_native_boolean = True
|
||||
supports_smallserial = True
|
||||
|
||||
supports_sequences = True
|
||||
sequences_optional = True
|
||||
@@ -1370,6 +1376,10 @@ class PGDialect(default.DefaultDialect):
|
||||
# psycopg2, others may have placed ENUM here as well
|
||||
self.colspecs.pop(ENUM, None)
|
||||
|
||||
# http://www.postgresql.org/docs/9.3/static/release-9-2.html#AEN116689
|
||||
self.supports_smallserial = self.server_version_info >= (9, 2)
|
||||
|
||||
|
||||
def on_connect(self):
|
||||
if self.isolation_level is not None:
|
||||
def connect(conn):
|
||||
|
||||
@@ -203,17 +203,30 @@ class MiscTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
|
||||
assert_raises(exc.InvalidRequestError, testing.db.execute, stmt)
|
||||
|
||||
def test_serial_integer(self):
|
||||
for type_, expected in [
|
||||
(Integer, 'SERIAL'),
|
||||
(BigInteger, 'BIGSERIAL'),
|
||||
(SmallInteger, 'SMALLINT'),
|
||||
(postgresql.INTEGER, 'SERIAL'),
|
||||
(postgresql.BIGINT, 'BIGSERIAL'),
|
||||
|
||||
for version, type_, expected in [
|
||||
(None, Integer, 'SERIAL'),
|
||||
(None, BigInteger, 'BIGSERIAL'),
|
||||
((9, 1), SmallInteger, 'SMALLINT'),
|
||||
((9, 2), SmallInteger, 'SMALLSERIAL'),
|
||||
(None, postgresql.INTEGER, 'SERIAL'),
|
||||
(None, postgresql.BIGINT, 'BIGSERIAL'),
|
||||
]:
|
||||
m = MetaData()
|
||||
|
||||
t = Table('t', m, Column('c', type_, primary_key=True))
|
||||
ddl_compiler = testing.db.dialect.ddl_compiler(testing.db.dialect, schema.CreateTable(t))
|
||||
|
||||
if version:
|
||||
dialect = postgresql.dialect()
|
||||
dialect._get_server_version_info = Mock(return_value=version)
|
||||
dialect.initialize(testing.db.connect())
|
||||
else:
|
||||
dialect = testing.db.dialect
|
||||
|
||||
ddl_compiler = dialect.ddl_compiler(
|
||||
dialect,
|
||||
schema.CreateTable(t)
|
||||
)
|
||||
eq_(
|
||||
ddl_compiler.get_column_specification(t.c.c),
|
||||
"c %s NOT NULL" % expected
|
||||
|
||||
Reference in New Issue
Block a user