[Checkins] SVN: Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/ updated

[Andreas Jung]

Log message for revision 84883:
  updated
  

Changed:
  U   Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/da.py
  U   Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/tests/testSQLAlchemyDA.py

-=-
Modified: Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/da.py
===================================================================
--- Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/da.py	2008-03-23 15:12:04 UTC (rev 84882)
+++ Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/da.py	2008-03-23 15:13:18 UTC (rev 84883)
@@ -154,6 +154,7 @@
 
        
         c = self._wrapper.connection
+        cursor = c.cursor()
 
         rows = []
         desc = None
@@ -164,13 +165,12 @@
         for qs in [x for x in query_string.split('\0') if x]:
 
             LOG.debug(qs)
-               
             if query_data:
-                proxy = c.execute(qs, query_data)
+                proxy = cursor.execute(qs, query_data)
             else:
-                proxy = c.execute(qs)
+                proxy = cursor.execute(qs)
 
-            description = proxy.description
+            description = cursor.description
 
             if description is not None:
                 nselects += 1
@@ -179,9 +179,9 @@
                     raise ValueError("Can't execute multiple SELECTs within a single query")
 
                 if max_rows:
-                    rows = proxy.fetchmany(max_rows)
+                    rows = cursor.fetchmany(max_rows)
                 else:
-                    rows = proxy.fetchall()
+                    rows = cursor.fetchall()
 
                 desc = description  
                 types_map = self._typesMap(proxy)

Modified: Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/tests/testSQLAlchemyDA.py
===================================================================
--- Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/tests/testSQLAlchemyDA.py	2008-03-23 15:12:04 UTC (rev 84882)
+++ Products.SQLAlchemyDA/trunk/Products/SQLAlchemyDA/tests/testSQLAlchemyDA.py	2008-03-23 15:13:18 UTC (rev 84883)
@@ -9,14 +9,15 @@
 
 import sys, os, unittest
 from Testing import ZopeTestCase
-ZopeTestCase.installProduct('SQLAlchemyDA', 1)
 
+import transaction
 from Products.SQLAlchemyDA.da import SAWrapper
 from z3c.sqlalchemy import createSAWrapper
 from z3c.sqlalchemy.mapper import MappedClassBase
 from sqlalchemy import MetaData, Table, Column, Integer, String, Unicode
 from sqlalchemy.orm import mapper
 
+ZopeTestCase.installProduct('SQLAlchemyDA', 1)
 
 class SQLAlchemyDATests(ZopeTestCase.ZopeTestCase):
 
@@ -62,7 +63,6 @@
         da = self.makeOne()
         rows = da.query("update test set text='bar'")
 
-
 def test_suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(SQLAlchemyDATests))
@@ -83,5 +83,3 @@
         globals()[sys.argv[1]]()
     else:
         main()
-
-