[SQL-CVS] SQLObject/SQLObject SQLObject.py,1.46,1.47

[<ian...@us...>]

Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv31194/SQLObject

Modified Files:
	SQLObject.py 
Log Message:
Fixed SelectResults so that it took a list as orderBy


Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** SQLObject.py	26 Jun 2003 08:33:56 -0000	1.46
--- SQLObject.py	10 Jul 2003 19:16:07 -0000	1.47
***************
*** 979,994 ****
              self.ops['orderBy'] = sourceClass._defaultOrder
          orderBy = self.ops['orderBy']
!         if orderBy is not None:
!             if isinstance(orderBy, str) and orderBy.startswith('-'):
!                 orderBy = orderBy[1:]
!                 desc = True
!             else:
!                 desc = False
!             if sourceClass._SO_columnDict.has_key(orderBy):
!                 self.ops['dbOrderBy'] = sourceClass._SO_columnDict[orderBy].dbName
              else:
!                 self.ops['dbOrderBy'] = orderBy
              if desc:
!                 self.ops['dbOrderBy'] = '-' + self.ops['dbOrderBy']
  
      def clone(self, **newOps):
--- 979,1005 ----
              self.ops['orderBy'] = sourceClass._defaultOrder
          orderBy = self.ops['orderBy']
!         if isinstance(orderBy, list) or isinstance(orderBy, tuple):
!             orderBy = map(self._mungeOrderBy, orderBy)
!         else:
!             orderBy = self._mungeOrderBy(orderBy)
!         self.ops['dbOrderBy'] = orderBy
! 
!     def _mungeOrderBy(self, orderBy):
!         if isinstance(orderBy, str) and orderBy.startswith('-'):
!             orderBy = orderBy[1:]
!             desc = True
!         else:
!             desc = False
!         if self.sourceClass._SO_columnDict.has_key(orderBy):
!             val = self.sourceClass._SO_columnDict[orderBy].dbName
!             if desc:
!                 return '-' + val
              else:
!                 return val
!         else:
              if desc:
!                 return SQLBuilder.DESC(orderBy)
!             else:
!                 return orderBy
  
      def clone(self, **newOps):