Author: phd
Date: 2005-06-29 15:58:25 +0000 (Wed, 29 Jun 2005)
New Revision: 825
Modified:
trunk/SQLObject/sqlobject/sresults.py
Log:
Added _getConnection() that gets a connection from self.ops and
if it is not there gets it from soClass. Previous code does this
not lazily, always asking soClass for _connection regardless
of whether there is a connection in self.ops.
Modified: trunk/SQLObject/sqlobject/sresults.py
===================================================================
--- trunk/SQLObject/sqlobject/sresults.py 2005-06-29 06:01:51 UTC (rev 824)
+++ trunk/SQLObject/sqlobject/sresults.py 2005-06-29 15:58:25 UTC (rev 825)
@@ -34,8 +34,11 @@
def __repr__(self):
return "<%s at %x>" % (self.__class__.__name__, id(self))
+ def _getConnection(self):
+ return self.ops.get('connection') or self.sourceClass._connection
+
def __str__(self):
- conn = self.ops.get('connection', self.sourceClass._connection)
+ conn = self._getConnection()
return conn.queryForSelect(self)
def _mungeOrderBy(self, orderBy):
@@ -140,10 +143,7 @@
return list(self.clone(start=start, end=start+1))[0]
def __iter__(self):
- if self.ops.get('connection'):
- conn = self.ops.get('connection')
- else:
- conn = self.sourceClass._connection
+ conn = self._getConnection()
return conn.iterSelect(self)
def accumulate(self, *expressions):
@@ -152,7 +152,7 @@
connection.
Return the accumulate result
"""
- conn = self.ops.get('connection', self.sourceClass._connection)
+ conn = self._getConnection()
return conn.accumulateSelect(self, *expressions)
def count(self):
|
