[gnue] r7274 - trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi

[reinhard]

Author: reinhard
Date: 2005-03-29 12:48:59 -0600 (Tue, 29 Mar 2005)
New Revision: 7274

Removed:
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
Modified:
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
Log:
Use _broken_rowcount for adodbapi driver instead of own implementation of
DataObject.


Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py   
2005-03-29 18:41:43 UTC (rev 7273)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py   
2005-03-29 18:48:59 UTC (rev 7274)
@@ -40,9 +40,7 @@
 from gnue.common.datasources.drivers import DBSIG2
 from gnue.common.datasources.drivers.adodbapi.Schema.Discovery.Introspection 
import Introspection
 
-import DataObject
 
-
 # =============================================================================
 # ADO Connection class
 # =============================================================================
@@ -56,10 +54,8 @@
 
   defaultBehavior = Introspection
 
-  supportedDataObjects = {
-    'object': DataObject.DataObject_Object,
-    'sql':    DataObject.DataObject_SQL
-  }
+  supportedDataObjects = {'object': DBSIG2.DataObject_Object,
+                          'sql':    DBSIG2.DataObject_SQL}
 
   # ---------------------------------------------------------------------------
   # Build up parameters for connect method

Deleted: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2005-03-29 18:41:43 UTC (rev 7273)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2005-03-29 18:48:59 UTC (rev 7274)
@@ -1,66 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# adodbapi/DataObject.py
-#
-# DESCRIPTION:
-# Driver to provide access to data via adodbapi Driver
-#
-# NOTES:
-#
-
-__all__ = ['DataObject_SQL','DataObject_Object']
-
-from gnue.common.datasources import Exceptions, GConditions, GConnections
-from gnue.common.datasources.drivers import DBSIG2
-
-
-
-class DataObject_Object(DBSIG2.DataObject_Object):
-
-  def _createResultSet(self, conditions={}, readOnly=0, 
masterRecordSet=None,sql=""):
-
-    try:
-      cursor = self._dataConnection.cursor()
-
-      cursor.arraysize = self.cache
-      cursor.execute(self._buildQuery(conditions, additionalSQL=sql))
-
-      # pull a record count
-      if self._strictQueryCount:
-#        #disable the count query and see if anyone screams
-#        recordCount = cursor.rowcount
-
-        #adodbapi screams :(
-        recordCount = self._getQueryCount(conditions,sql)
-
-    except self._DatabaseError, err:
-      raise Exceptions.ConnectionError, err
-
-    rs = self._resultSetClass(self, cursor=cursor, 
masterRecordSet=masterRecordSet)
-    if self._strictQueryCount:
-      rs._recordCount = recordCount
-    if readOnly:
-      rs._readonly = readOnly
-
-    return rs
-
-DataObject_SQL = DBSIG2.DataObject_SQL