removed the connection_memoize stuff.

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 646520982f1d6f7fd754663d531a7baf41a23f51..8df54bcafe280de67d6148518587d1f4b7087214 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1105,7 +1105,6 @@ class MSDialect(default.DefaultDialect):
     def do_release_savepoint(self, connection, name):
         pass
 
-    @base.connection_memoize(('dialect', 'default_schema_name'))
     def get_default_schema_name(self, connection):
         query = "SELECT user_name() as user_name;"
         user_name = connection.scalar(sql.text(query))

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 00705b7ec15ba21d223903f28285b87f7e628741..c2eb61afb7e7e2cb548f75ca6cf49835d1b77c7e 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1777,7 +1777,6 @@ class MySQLDialect(default.DefaultDialect):
     def _extract_error_code(self, exception):
         raise NotImplementedError()
     
-    @engine_base.connection_memoize(('dialect', 'default_schema_name'))
     def get_default_schema_name(self, connection):
         return connection.execute('SELECT DATABASE()').scalar()
 
@@ -2010,11 +2009,9 @@ class MySQLDialect(default.DefaultDialect):
             lc_alias = schema._get_table_key(table.name, table.schema)
             table.metadata.tables[lc_alias] = table
 
-    #@engine_base.connection_memoize(('mysql', 'charset'))
     def _detect_charset(self, connection):
         raise NotImplementedError()
 
-    #@engine_base.connection_memoize(('mysql', 'lower_case_table_names'))
     def _detect_casing(self, connection):
         """Sniff out identifier case sensitivity.
 
@@ -2042,7 +2039,6 @@ class MySQLDialect(default.DefaultDialect):
             row.close()
         return cs
 
-    #@engine_base.connection_memoize(('mysql', 'collations'))
     def _detect_collations(self, connection):
         """Pull the active COLLATIONS list from the server.
 

diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index 57c919f113b1f5033ad60e03ec6b3d5c50b7258f..b0fac6c44feae2a9cba8d50be828e2f88bd7fec8 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -103,7 +103,6 @@ class MySQL_mysqldb(MySQLDialect):
     def do_ping(self, connection):
         connection.ping()
 
-    #@engine_base.connection_memoize(('mysql', 'server_version_info'))
     def _get_server_version_info(self, connection):
         dbapi_con = connection.connection
         version = []

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index a061b6eca79e6bd875edc0562ada722c98a65ff5..69461b456bcc5db1dc57e6c2aace68ebac7fe532 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -509,7 +509,6 @@ class OracleDialect(default.DefaultDialect):
         else:
             return name.encode(self.encoding)
 
-    @base.connection_memoize(('dialect', 'default_schema_name'))
     def get_default_schema_name(self, connection):
         return self._normalize_name(connection.execute('SELECT USER FROM DUAL').scalar())
 

diff --git a/lib/sqlalchemy/dialects/postgres/base.py b/lib/sqlalchemy/dialects/postgres/base.py
index 03ad2ca559a562844671647b9afc5fc39e32b3ae..e6be822fd4650f73eb17f9b578d08a3b498fee82 100644 (file)
--- a/lib/sqlalchemy/dialects/postgres/base.py
+++ b/lib/sqlalchemy/dialects/postgres/base.py
@@ -497,7 +497,6 @@ class PGDialect(default.DefaultDialect):
         resultset = connection.execute(sql.text("SELECT gid FROM pg_prepared_xacts"))
         return [row[0] for row in resultset]
 
-    @base.connection_memoize(('dialect', 'default_schema_name'))
     def get_default_schema_name(self, connection):
         return connection.scalar("select current_schema()")
 

diff --git a/test/dialect/mysql.py b/test/dialect/mysql.py
index 8bcd8974ce77562196dddce4decd97328696f3b7..acd1c5a43b18f40da751bce2c1cb9e442219d1d1 100644 (file)
--- a/test/dialect/mysql.py
+++ b/test/dialect/mysql.py
@@ -1009,37 +1009,10 @@ class ExecutionTest(TestBase):
 
         cx = engine.connect()
         meta = MetaData()
-
-        assert ('mysql', 'charset') not in cx.info
-        assert ('mysql', 'force_charset') not in cx.info
-
-        cx.execute(text("SELECT 1")).fetchall()
-        assert ('mysql', 'charset') not in cx.info
-
-        meta.reflect(cx)
-        assert ('mysql', 'charset') in cx.info
-
-        cx.execute(text("SET @squiznart=123"))
-        assert ('mysql', 'charset') in cx.info
-
-        # the charset invalidation is very conservative
-        cx.execute(text("SET TIMESTAMP = DEFAULT"))
-        assert ('mysql', 'charset') not in cx.info
-
-        cx.info[('mysql', 'force_charset')] = 'latin1'
-
         assert engine.dialect._detect_charset(cx) == 'latin1'
-        assert cx.info[('mysql', 'charset')] == 'latin1'
-
-        del cx.info[('mysql', 'force_charset')]
-        del cx.info[('mysql', 'charset')]
 
         meta.reflect(cx)
-        assert ('mysql', 'charset') in cx.info
-
-        # String execution doesn't go through the detector.
-        cx.execute("SET TIMESTAMP = DEFAULT")
-        assert ('mysql', 'charset') in cx.info
+        assert cx.dialect._connection_charset == 'latin1'
 
 
 class MatchTest(TestBase, AssertsCompiledSQL):