From 8c3d847db027c64f67a694975de9d36f6c2e50ce Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 24 May 2012 18:49:23 -0400 Subject: [PATCH] - [bug] Dialect no longer emits expensive server collations query, as well as server casing, on first connect. These functions are still available as semi-private. [ticket:2404] --- CHANGES | 5 +++++ lib/sqlalchemy/dialects/mysql/base.py | 2 -- test/lib/requires.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f37170c0af..b582658956 100644 --- a/CHANGES +++ b/CHANGES @@ -382,6 +382,11 @@ CHANGES expressions. [ticket:2467] also in 0.7.7. + - [bug] Dialect no longer emits expensive server + collations query, as well as server casing, + on first connect. These functions are still + available as semi-private. [ticket:2404] + - oracle - [bug] Quoting information is now passed along from a Column with quote=True when generating diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index a61d59e9bf..afac0d1a4d 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1980,8 +1980,6 @@ class MySQLDialect(default.DefaultDialect): def initialize(self, connection): default.DefaultDialect.initialize(self, connection) self._connection_charset = self._detect_charset(connection) - self._server_casing = self._detect_casing(connection) - self._server_collations = self._detect_collations(connection) self._detect_ansiquotes(connection) if self._server_ansiquotes: # if ansiquotes == True, build a new IdentifierPreparer diff --git a/test/lib/requires.py b/test/lib/requires.py index d52d26e324..2ac9391127 100644 --- a/test/lib/requires.py +++ b/test/lib/requires.py @@ -395,11 +395,11 @@ def _has_sqlite(): def _has_mysql_on_windows(): return testing.against('mysql') and \ - testing.db.dialect._server_casing == 1 + testing.db.dialect._detect_casing(testing.db) == 1 def _has_mysql_fully_case_sensitive(): return testing.against('mysql') and \ - testing.db.dialect._server_casing == 0 + testing.db.dialect._detect_casing(testing.db) == 0 def sqlite(fn): return _chain_decorators_on( -- 2.47.3