- MySQL detects errors 2006 (server has gone away) and 2014

(commands out of sync) and invalidates the connection on which it occured.

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 99504e136..8e74f0343 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -187,7 +187,7 @@ class _ConnectionFairy(object):
     """proxies a DBAPI connection object and provides return-on-dereference support"""
     def __init__(self, pool):
         self._threadfairy = _ThreadFairy(self)
-        self.cursors = weakref.WeakKeyDictionary()
+        self.cursors = {}
         self.__pool = pool
         self.__counter = 0
         try:
@@ -220,8 +220,9 @@ class _ConnectionFairy(object):
         self.__counter +=1
         return self    
     def close_open_cursors(self):
-        for c in list(self.cursors):
-            c.close()
+        if self.cursors is not None:
+            for c in list(self.cursors):
+                c.close()
     def close(self):
         self.__counter -=1
         if self.__counter == 0:
@@ -255,13 +256,15 @@ class _CursorFairy(object):
         self.__parent = parent
         self.__parent.cursors[self]=True
         self.cursor = cursor
+    def invalidate(self):
+        self.__parent.invalidate()
     def close(self):
         if self in self.__parent.cursors:
             del self.__parent.cursors[self]
             self.cursor.close()
     def __getattr__(self, key):
         return getattr(self.cursor, key)
-
+            
 class SingletonThreadPool(Pool):
     """Maintains one connection per each thread, never moving a connection to a thread
     other than the one which it was created in.