[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5842 - trunk/gnue-common/src/datasources/drivers/interbase/interbase
From: |
johannes |
Subject: |
r5842 - trunk/gnue-common/src/datasources/drivers/interbase/interbase |
Date: |
Fri, 28 May 2004 03:30:15 -0500 (CDT) |
Author: johannes
Date: 2004-05-28 03:30:14 -0500 (Fri, 28 May 2004)
New Revision: 5842
Modified:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
Log:
Removed the duplicate calls to _getQueryCount
Modified:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
2004-05-28 07:51:52 UTC (rev 5841)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
2004-05-28 08:30:14 UTC (rev 5842)
@@ -37,49 +37,45 @@
from gnue.common.datasources.drivers import DBSIG2
from ResultSet import ResultSet
-class _Base(DBSIG2.DataObject):
+class _Base (DBSIG2.DataObject):
# The date/time format used in insert/select statements
# (based on format used for time.strftime())
_dateTimeFormat = "cast('%Y-%m-%d %H:%M:%S' as timestamp)"
_resultSetClass = ResultSet
- def _createResultSet(self, conditions={}, readOnly=0,
masterRecordSet=None,sql=""):
+ # ---------------------------------------------------------------------------
+ # Create a result set
+ # ---------------------------------------------------------------------------
+ def _createResultSet (self, conditions = {}, readOnly = 0,
+ masterRecordSet = None, sql = ""):
+
# Used by drivers with a unique id (like rowid)
- if not self._primaryIdChecked: self._checkForPrimaryId()
+ if not self._primaryIdChecked:
+ self._checkForPrimaryId()
try:
- cursor = self._dataConnection.cursor()
-
+ query = self._buildQuery (conditions, additionalSQL = sql)
+ cursor = self._connection.makecursor (query)
cursor.arraysize = self.cache
- cursor.execute(self._buildQuery(conditions, additionalSQL=sql))
- # pull a record count
- if self._strictQueryCount:
-# recordCount = cursor.rowcount
-# #disable the count query and see if anyone screams
-# #recordCount = self._getQueryCount(conditions,sql)
-
- #kinterbasdb screams :(
- recordCount = self._getQueryCount(conditions,sql)
-
except self._DatabaseError, err:
raise GDataObjects.ConnectionError, err
- rs = self._resultSetClass(self, cursor=cursor,
- masterRecordSet=masterRecordSet, conditions=conditions, sql=sql,
+ # Our ResultSet class performs an implicit record-count in it's constructor
+ # so we won't force another duplicate count
+ rs = self._resultSetClass (self, cursor = cursor,
+ masterRecordSet = masterRecordSet, conditions = conditions, sql = sql,
fieldOrder = self._fieldOrder)
- if self._strictQueryCount:
- rs._recordCount = recordCount
if readOnly:
rs._readonly = readOnly
return rs
-class DataObject_Object(_Base, DBSIG2.DataObject_Object):
+class DataObject_Object (_Base, DBSIG2.DataObject_Object):
pass
-class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
+class DataObject_SQL (_Base, DBSIG2.DataObject_SQL):
pass
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r5842 - trunk/gnue-common/src/datasources/drivers/interbase/interbase,
johannes <=