[SQL-CVS] r1630 - home/phd/SQLObject/paramstyles/sqlobject/sqlite

[<sub...@co...>]

Author: phd
Date: 2006-02-26 09:54:02 -0700 (Sun, 26 Feb 2006)
New Revision: 1630

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py
Log:
Merged patches from the revisions 1627:1629 from the trunk: fixed a bug with :memory: database.

Modified: home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py	2006-02-26 16:52:19 UTC (rev 1629)
+++ home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py	2006-02-26 16:54:02 UTC (rev 1630)
@@ -95,7 +95,10 @@
         # pool connections.  Since we are isolating threads here, we
         # don't have to worry about locking as much.
         if self._memory:
-            return self.makeConnection()
+            conn = self.makeConnection()
+            self._connectionNumbers[id(conn)] = self._connectionCount
+            self._connectionCount += 1
+            return conn
         threadid = thread.get_ident()
         if (self._pool is not None
             and self._threadPool.has_key(threadid)):