Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv15815
Modified Files:
SQLObject.py
Log Message:
* Removed __len__ on SelectResults, replace with count()
* Fixed .reverse()
* Removed groupBy options to SelectResults
Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** SQLObject.py 3 Nov 2003 13:20:29 -0000 1.63
--- SQLObject.py 12 Nov 2003 17:06:00 -0000 1.64
***************
*** 934,942 ****
def select(cls, clause=None, clauseTables=None,
! orderBy=NoDefault, groupBy=None, limit=None,
lazyColumns=False, reversed=False,
connection=None):
return SelectResults(cls, clause, clauseTables=clauseTables,
! orderBy=orderBy, groupBy=groupBy,
limit=limit, lazyColumns=lazyColumns,
reversed=reversed,
--- 934,942 ----
def select(cls, clause=None, clauseTables=None,
! orderBy=NoDefault, limit=None,
lazyColumns=False, reversed=False,
connection=None):
return SelectResults(cls, clause, clauseTables=clauseTables,
! orderBy=orderBy,
limit=limit, lazyColumns=lazyColumns,
reversed=reversed,
***************
*** 1111,1117 ****
return self.clone(orderBy=orderBy)
- def groupBy(self, groupBy):
- return self.clone(groupBy=groupBy)
-
def connection(self, conn):
return self.clone(connection=conn)
--- 1111,1114 ----
***************
*** 1124,1128 ****
def reversed(self):
! self.clone(reversed=not self.ops.get('reversed', False))
def __getitem__(self, value):
--- 1121,1125 ----
def reversed(self):
! return self.clone(reversed=not self.ops.get('reversed', False))
def __getitem__(self, value):
***************
*** 1179,1183 ****
return conn.iterSelect(self)
! def __len__(self):
conn = self.ops.get('connection', self.sourceClass._connection)
count = conn.countSelect(self)
--- 1176,1180 ----
return conn.iterSelect(self)
! def count(self):
conn = self.ops.get('connection', self.sourceClass._connection)
count = conn.countSelect(self)
|
