From: Michael Trier <mtrier@gmail.com>
Date: Fri, 24 Apr 2009 02:31:31 +0000 (+0000)
Subject: removed the connection_memoize stuff.
X-Git-Tag: rel_0_6_6~225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1474fd4fbce1d04f747155800f8a7b36b6a1c2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

removed the connection_memoize stuff.
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 646520982f..8df54bcafe 100644
--- 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 00705b7ec1..c2eb61afb7 100644
--- 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 57c919f113..b0fac6c44f 100644
--- 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 a061b6eca7..69461b456b 100644
--- 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 03ad2ca559..e6be822fd4 100644
--- 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 8bcd8974ce..acd1c5a43b 100644
--- 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):