[Checkins] SVN: Products.SQLAlchemyDA/trunk/da.py fixes for SA 0.4.0

[Andreas Jung]

Log message for revision 80331:
  fixes for SA 0.4.0
  

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

-=-
Modified: Products.SQLAlchemyDA/trunk/da.py
===================================================================
--- Products.SQLAlchemyDA/trunk/da.py	2007-09-28 15:36:30 UTC (rev 80330)
+++ Products.SQLAlchemyDA/trunk/da.py	2007-09-28 15:40:38 UTC (rev 80331)
@@ -142,6 +142,7 @@
             machinery.
         """
 
+       
         c = self._wrapper.connection
 
         rows = []
@@ -208,7 +209,7 @@
     security.declareProtected(view_management_screens, 'connected')
     def connected(self):
         try:
-            return self._wrapper._engine.connection_provider._pool.checkedin() > 0
+            return self._wrapper._engine.pool.checkedin() > 0
         except:
             return 'n/a'
 
@@ -216,17 +217,14 @@
     security.declareProtected(view_management_screens, 'getPoolSize')
     def getPoolSize(self):
         """ """
-        try: 
-            return self._wrapper._engine.connection_provider._pool.size() 
-        except:
-            return self._wrapper._engine.connection_provider._pool
+        return self._wrapper._engine.pool.size() 
 
 
     security.declareProtected(view_management_screens, 'getCheckedin')
     def getCheckedin(self):
         """ """
         try:
-            return self._wrapper._engine.connection_provider._pool.checkedin() 
+            return self._wrapper._engine.pool.checkedin() 
         except:
             return 'n/a'
 
@@ -251,7 +249,7 @@
     security.declareProtected(view_management_screens, 'manage_stop')
     def manage_stop(self, RESPONSE=None):
         """ close engine """
-        self._wrapper._engine.connection_provider._pool.dispose()
+        self._wrapper._engine.pool.dispose()
         if RESPONSE:
             msg = 'Database connections closed'
             RESPONSE.redirect(self.absolute_url() + '/manage_workspace?manage_tabs_message=%s' % msg)