From: Georg Wicke-Arndt Date: Sat, 13 Jan 2024 23:19:06 +0000 (+0100) Subject: Convert _supports_notnull_generated_columns into property X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d58aaa81815264c571ca9ccaca3d256c48d74c7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Convert _supports_notnull_generated_columns into property --- diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index fb1beca048..c470c3af91 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2446,9 +2446,6 @@ class MySQLDialect(default.DefaultDialect): supports_for_update_of = False # default for MySQL ... # ... may be updated to True for MySQL 8+ in initialize() - supports_notnull_generated_columns = False # Only available ... - # ... in MySQL 5.7+ - _requires_alias_for_on_duplicate_key = False # Only available ... # ... in MySQL 8+ @@ -2849,10 +2846,6 @@ class MySQLDialect(default.DefaultDialect): self._is_mysql and self.server_version_info >= (8,) ) - self.supports_notnull_generated_columns = ( - self._is_mysql and self.server_version_info >= (5, 7) - ) - self._needs_correct_for_88718_96365 = ( not self.is_mariadb and self.server_version_info >= (8,) ) @@ -2910,6 +2903,10 @@ class MySQLDialect(default.DefaultDialect): 10, 2, ) + + @property + def _supports_notnull_generated_columns(self): + return self._is_mysql and self.server_version_info >= (5, 7) @reflection.cache def get_schema_names(self, connection, **kw): diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py index d4b34b2db2..02d72f370d 100644 --- a/test/dialect/mysql/test_reflection.py +++ b/test/dialect/mysql/test_reflection.py @@ -792,7 +792,7 @@ class ReflectionTest(fixtures.TestBase, AssertsCompiledSQL): ["u TIMESTAMP DEFAULT CURRENT_TIMESTAMP"], ["v INTEGER GENERATED ALWAYS AS (4711) VIRTUAL NOT NULL"], ] - if connection.dialect.supports_notnull_generated_columns: + if connection.dialect._supports_notnull_generated_columns: test_cases.append( ["v INTEGER GENERATED ALWAYS AS (4711) VIRTUAL NOT NULL"])