summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
authorFederico Caselli <cfederico87@gmail.com>2021-04-21 22:49:09 +0200
committerMike Bayer <mike_mp@zzzcomputing.com>2021-04-28 20:03:27 -0400
commitd3c73ad8012e15bf47529b3fcb0bac1298fbdb90 (patch)
tree31ae2c420b9d58d55e56a9191a34176c1deb7c16 /lib/sqlalchemy/dialects
parent1443945e61f1f113e46a5044315a91558d4d232a (diff)
downloadsqlalchemy-d3c73ad8012e15bf47529b3fcb0bac1298fbdb90.tar.gz
Propertly ignore ``Identity`` in MySQL and MariaDb.
Ensure that the MySQL and MariaDB dialect ignore the :class:`_sql.Identity` construct while rendering the ``AUTO_INCREMENT`` keyword in a create table. The Oracle and PostgreSQL compiler was updated to not render :class:`_sql.Identity` if the database version does not support it (Oracle < 12 and PostgreSQL < 10). Previously it was rendered regardless of the database version. Fixes: #6338 Change-Id: I2ca0902fdd7b4be4fc1a563cf5585504cbea9360
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py5
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py3
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py16
3 files changed, 19 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index d4c70a78e..88c03a011 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1933,7 +1933,10 @@ class MySQLDDLCompiler(compiler.DDLCompiler):
if (
column.table is not None
and column is column.table._autoincrement_column
- and column.server_default is None
+ and (
+ column.server_default is None
+ or isinstance(column.server_default, sa_schema.Identity)
+ )
and not (
self.dialect.supports_sequences
and isinstance(column.default, sa_schema.Sequence)
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 9571eb46f..57f55c182 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -1457,6 +1457,7 @@ class OracleDialect(default.DefaultDialect):
supports_default_values = False
supports_default_metavalue = True
supports_empty_insert = False
+ supports_identity_columns = True
statement_compiler = OracleCompiler
ddl_compiler = OracleDDLCompiler
@@ -1513,6 +1514,8 @@ class OracleDialect(default.DefaultDialect):
self.colspecs.pop(sqltypes.Interval)
self.use_ansi = False
+ self.supports_identity_columns = self.server_version_info >= (12,)
+
def _get_effective_compat_server_version_info(self, connection):
# dialect does not need compat levels below 12.2, so don't query
# in those cases
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 47a933479..26b025b1a 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -2464,6 +2464,11 @@ class PGDDLCompiler(compiler.DDLCompiler):
if isinstance(impl_type, sqltypes.TypeDecorator):
impl_type = impl_type.impl
+ has_identity = (
+ column.identity is not None
+ and self.dialect.supports_identity_columns
+ )
+
if (
column.primary_key
and column is column.table._autoincrement_column
@@ -2471,7 +2476,7 @@ class PGDDLCompiler(compiler.DDLCompiler):
self.dialect.supports_smallserial
or not isinstance(impl_type, sqltypes.SmallInteger)
)
- and column.identity is None
+ and not has_identity
and (
column.default is None
or (
@@ -2498,12 +2503,12 @@ class PGDDLCompiler(compiler.DDLCompiler):
if column.computed is not None:
colspec += " " + self.process(column.computed)
- if column.identity is not None:
+ if has_identity:
colspec += " " + self.process(column.identity)
- if not column.nullable and not column.identity:
+ if not column.nullable and not has_identity:
colspec += " NOT NULL"
- elif column.nullable and column.identity:
+ elif column.nullable and has_identity:
colspec += " NULL"
return colspec
@@ -3086,6 +3091,8 @@ class PGDialect(default.DefaultDialect):
supports_empty_insert = False
supports_multivalues_insert = True
+ supports_identity_columns = True
+
default_paramstyle = "pyformat"
ischema_names = ischema_names
colspecs = colspecs
@@ -3193,6 +3200,7 @@ class PGDialect(default.DefaultDialect):
9,
2,
)
+ self.supports_identity_columns = self.server_version_info >= (10,)
def on_connect(self):
if self.isolation_level is not None: