diff options
| author | Gord Thompson <gord@gordthompson.com> | 2021-06-24 12:16:32 -0600 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-07-03 18:50:03 -0400 |
| commit | b920869ef54d05e73e2a980b73647d6050ffeb9d (patch) | |
| tree | 907f866bf583038751a450e9c6249ef6ff3d0111 /lib/sqlalchemy | |
| parent | cb9f6f83b21b9e65db6cf1ce74f55ecfd0907735 (diff) | |
| download | sqlalchemy-b920869ef54d05e73e2a980b73647d6050ffeb9d.tar.gz | |
Modernize tests
Eliminate engine.execute() and engine.scalar()
Change-Id: I99f76d0e615ddebab2da4fd07a40a0a2796995c7
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/warnings.py | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index cfb6c2924..e39010762 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -3358,10 +3358,11 @@ class MySQLDialect(default.DefaultDialect): # https://dev.mysql.com/doc/refman/en/identifier-case-sensitivity.html charset = self._connection_charset + show_var = connection.execute( + sql.text("SHOW VARIABLES LIKE 'lower_case_table_names'") + ) row = self._compat_first( - connection.execute( - sql.text("SHOW VARIABLES LIKE 'lower_case_table_names'") - ), + show_var, charset=charset, ) if not row: diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py index 30f50a44f..df0e5aa5e 100644 --- a/lib/sqlalchemy/testing/warnings.py +++ b/lib/sqlalchemy/testing/warnings.py @@ -68,7 +68,6 @@ def setup_filters(): # # Core execution # - r"The (?:Executable|Engine)\.(?:execute|scalar)\(\) method", # r".*DefaultGenerator.execute\(\)", # # |