sqlobject-cvs Mailing List for SQLObject (Page 186)

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

Modified Files:
	codebits.py 
Added Files:
	leftjoin.py 
Log Message:
Added a FAQ, with requisite examples


--- NEW FILE: leftjoin.py ---
from SQLObject import *

## Use one of these to define your connection:
"""
conn = MySQLConnection(user='test', db='testdb')
conn = PostgresConnection('user=test dbname=testdb')
conn = SQLiteConnect('database.db')
conn = DBMConnection('database/')
"""
__connection__ = MySQLConnection(user='test', db='test')


class Customer(SQLObject):

    firstName = StringCol(length=100)
    lastName = StringCol(length=100)
    contacts = MultipleJoin('Contact')

class Contact(SQLObject):

    customer = ForeignKey('Customer')
    phoneNumber = StringCol(length=20)

Customer.dropTable(ifExists=True)
Customer.createTable()
Contact.dropTable(ifExists=True)
Contact.createTable()

data = [
    ['Joe Henry', '384-374-3584', '984-384-8594', '384-957-3948'],
    ['Tim Jackson', '204-485-9384'],
    ['Jane Austin'],
    ]

for insert in data:
    firstName, lastName = insert[0].split(' ', 1)
    customer = Customer.new(firstName=firstName, lastName=lastName)
    for number in insert[1:]:
        contact = Contact.new(customer=customer, phoneNumber=number)

## Snippet "leftjoin-simple"
for customer in Customer.select():
    print customer.firstName, customer.lastName
    for contact in customer.contacts:
        print '   ', contact.phoneNumber
## end snippet

## Snippet "leftjoin-more"
custContacts = {}
for contact in Contact.select():
    custContacts.setdefault(contact.customerID, []).append(contact)
for customer in Customer.select():
    print customer.firstName, customer.lastName
    for contact in custContacts.get(customer.id, []):
        print '   ', contact.phoneNumber
## end snippet

## Snippet "leftjoin-more-query"
query = Customer.q.firstName.startswith('J')
custContacts = {}
for contact in Contact.select(AND(Contact.q.customerID == Customer.q.id,
                                  query)):
    custContacts.setdefault(contact.customerID, []).append(contact)
for customer in Customer.select(query):
    print customer.firstName, customer.lastName
    for contact in custContacts.get(customer.id, []):
        print '   ', contact.phoneNumber
## end snippet

Index: codebits.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/examples/codebits.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** codebits.py	28 Jun 2003 22:17:36 -0000	1.1
--- codebits.py	21 Aug 2003 05:02:17 -0000	1.2
***************
*** 81,82 ****
--- 81,222 ----
  ## end snippet
  
+ ## Snippet "site-sqlobject"
+ class SiteSQLObject(SQLObject):
+     _connection = DBConnection.MySQLConnection(user='test', db='test')
+     _style = MixedCaseStyle()
+ 
+     # And maybe you want a list of the columns, to autogenerate
+     # forms from:
+     def columns(self):
+         return [col.name for col in self._columns]
+ ## end snippet
+ 
+ ## Snippet "inheritance"
+ class Person(SQLObject):
+     firstName = StringCol()
+     lastName = StringCol()
+ 
+ class Employee(Person):
+     position = StringCol()
+ ## end snippet
+ 
+ """
+ ## Snippet "inheritance-schema"
+ CREATE TABLE person (
+     id INT PRIMARY KEY,
+     first_name TEXT,
+     last_name TEXT
+ );
+ 
+ CREATE TABLE employee (
+     id INT PRIMARY KEY
+     first_name TEXT,
+     last_name TEXT,
+     position TEXT
+ )
+ ## end snippet
+ """
+ 
+ ## Snippet "inheritance-faked"
+ class Person(SQLObject):
+     firstName = StringCol()
+     lastName = StringCol()
+     
+     def _get_employee(self):
+         value = Employee.selectBy(person=self)
+         if value:
+             return value[0]
+         else:
+             raise AttributeError, '%r is not an employee' % self
+     def _get_isEmployee(self):
+         value = Employee.selectBy(person=self)
+         # turn into a bool:
+         return not not value
+     def _set_isEmployee(self, value):
+         if value:
+             # Make sure we are an employee...
+             if not self.isEmployee:
+                 Empoyee.new(person=self, position=None)
+         else:
+             if self.isEmployee:
+                 self.employee.destroySelf()
+     def _get_position(self):
+         return self.employee.position
+     def _set_position(self, value):
+         self.employee.position = value
+ 
+ class Employee(SQLObject):
+     person = ForeignKey('Person')
+     position = StringCol()
+ ## end snippet
+ 
+ """
+ ## Snippet "composite-schema"
+ CREATE TABLE invoice_item (
+     id INT PRIMARY KEY,
+     amount NUMERIC(10, 2),
+     currency CHAR(3)
+ );
+ ## end snippet
+ """
+ 
+ ## Snippet "composite"
+ class InvoiceItem(SQLObject):
+     amount = Currency()
+     currency = StringChar(length=3)
+ 
+     def _get_price(self):
+         return Price(self.amount, self.currency)
+     def _set_price(self, price):
+         self.amount = price.amount
+         self.currency = price.currency
+ 
+ class Price(object):
+     def __init__(self, amount, currency):
+         self._amount = amount
+         self._currency = currency
+ 
+     def _get_amount(self):
+         return self._amount
+     amount = property(_get_amount)
+ 
+     def _get_currency(self):
+         return self._currency
+     currency = property(_get_currency)
+ 
+     def __repr__(self):
+         return '<Price: %s %s>' % (self.amount, self.currency)
+ ## end snippet
+ 
+ ## Snippet "composite-mutable"
+ class Address(SQLObject):
+     street = StringCol()
+     city = StringCol()
+     state = StringCol(length=2)
+     
+     latitude = FloatCol()
+     longitude = FloatCol()
+ 
+     def _init(self, id):
+         SQLObject._init(self, id)
+         self._coords = SOCoords(self)
+         
+     def _get_coords(self):
+         return self._coords
+ 
+ class SOCoords(object):
+     def __init__(self, so):
+         self._so = so
+ 
+     def _get_latitude(self):
+         return self._so.latitude
+     def _set_latitude(self, value):
+         self._so.latitude = value
+     latitude = property(_get_latitude, set_latitude)
+ 
+     def _get_longitude(self):
+         return self._so.longitude
+     def _set_longitude(self, value):
+         self._so.longitude = value
+     longitude = property(_get_longitude, set_longitude)
+ ## end snippet

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

Modified Files:
      Tag: sybase-support-branch
	SQLObjectTest.py test.py 
Log Message:
Branching for adding Sybase support

Index: SQLObjectTest.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/SQLObjectTest.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** SQLObjectTest.py	1 Aug 2003 01:29:28 -0000	1.10
--- SQLObjectTest.py	19 Aug 2003 12:53:10 -0000	1.10.2.1
***************
*** 39,43 ****
      return SQLiteConnection('data/sqlite.data')
  
! supportedDatabases = ['mysql', 'postgres', 'sqlite', 'dbm']
  
  class SQLObjectTest(unittest.TestCase):
--- 39,54 ----
      return SQLiteConnection('data/sqlite.data')
  
! def sybaseConnection():
!     SQLObjectTest.supportDynamic = False
!     SQLObjectTest.supportAuto = False
!     SQLObjectTest.supportRestrictedEnum = False
!     SQLObjectTest.supportTransactions = True
!     return SybaseConnection(host='muppet',
!                             db='test',
!                             user='sa',
!                             passwd='sybasesa',
!                             autoCommit=1)
! 
! supportedDatabases = ['mysql', 'postgres', 'sqlite', 'dbm', 'sybase']
  
  class SQLObjectTest(unittest.TestCase):
***************
*** 54,57 ****
--- 65,69 ----
              print '#' * 70
          unittest.TestCase.setUp(self)
+ 
          #__connection__.debug = self.debugSQL
          for c in self.classes:

Index: test.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test.py,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** test.py	17 Jul 2003 01:20:18 -0000	1.21
--- test.py	19 Aug 2003 12:53:10 -0000	1.21.2.1
***************
*** 199,202 ****
--- 199,203 ----
  ########################################
  
+ 
  class DeleteSelectTest(TestCase1):
  
***************
*** 209,212 ****
--- 210,214 ----
          self.assertEqual(list(TestSO1.select('all')), [])
  
+ 
  ########################################
  ## Transaction test
***************
*** 410,413 ****
--- 412,426 ----
      """
  
+     sybaseCreate = """
+     CREATE TABLE auto_test (
+       id integer,
+       first_name VARCHAR(100),
+       last_name VARCHAR(200) NOT NULL,
+       age INT DEFAULT 0,
+       created VARCHAT(40) NOT NULL,
+       happy char(1) DEFAULT 'Y' NOT NULL 
+     )
+     """
+ 
      mysqlDrop = """
      DROP TABLE IF EXISTS auto_test
***************
*** 415,418 ****
--- 428,435 ----
  
      postgresDrop = """
+     DROP TABLE auto_test
+     """
+ 
+     sybaseDrop = """
      DROP TABLE auto_test
      """

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

Modified Files:
      Tag: sybase-support-branch
	Col.py DBConnection.py SQLObject.py 
Log Message:
Branching for adding Sybase support

Index: Col.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Col.py,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** Col.py	28 Jun 2003 22:21:21 -0000	1.24
--- Col.py	19 Aug 2003 12:53:10 -0000	1.24.2.1
***************
*** 162,165 ****
--- 162,168 ----
              return ''
  
+     def _sybaseType(self):
+         return self._sqlType()
+ 
      def mysqlCreateSQL(self):
          return ' '.join([self.dbName, self._mysqlType()] + self._extraSQL())
***************
*** 171,174 ****
--- 174,180 ----
          return ' '.join([self.dbName, self._sqliteType()] + self._extraSQL())
  
+     def sybaseCreateSQL(self):
+         return ' '.join([self.dbName, self._sybaseType()] + self._extraSQL())
+ 
  class Col(object):
  
***************
*** 306,309 ****
--- 312,318 ----
          return self._postgresType()
  
+     def _sybaseType(self):
+         return self._postgresType()
+ 
  class EnumCol(Col):
      baseClass = SOEnumCol
***************
*** 320,325 ****
--- 329,354 ----
          return 'TIMESTAMP'
  
+     def _sybaseType(self):
+         return 'TIMESTAMP'
+ 
  class DateTimeCol(Col):
      baseClass = SODateTimeCol
+ 
+ class SODateCol(SOCol):
+ 
+     # 3-03 @@: provide constraints; right now we let the database
+     # do any parsing and checking.  And DATE and TIME?
+ 
+     def _mysqlType(self):
+         return 'DATE'
+ 
+     def _postgresType(self):
+         return 'DATE'
+ 
+     def _sybaseType(self):
+         return 'DATE'
+ 
+ class DateCol(Col):
+     baseClass = SODateCol
  
  class SODecimalCol(SOCol):

Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -d -r1.41 -r1.41.2.1
*** DBConnection.py	18 Jul 2003 03:15:50 -0000	1.41
--- DBConnection.py	19 Aug 2003 12:53:10 -0000	1.41.2.1
***************
*** 7,10 ****
--- 7,11 ----
  from Cache import CacheSet
  import Col
+ 
  try:
      import cPickle as pickle
***************
*** 29,32 ****
--- 30,43 ----
  except ImportError:
      sqlite = None
+ 
+ try:
+     import Sybase
+     from Sybase import NumericType
+     from Converters import registerConverter, IntConverter
+     registerConverter(NumericType, IntConverter)
+ 
+ except ImportError:
+     Sybase = None
+ 
  import re
  import warnings
***************
*** 36,40 ****
  
  __all__ = ['MySQLConnection', 'PostgresConnection', 'SQLiteConnection',
!            'DBMConnection']
  
  _connections = {}
--- 47,51 ----
  
  __all__ = ['MySQLConnection', 'PostgresConnection', 'SQLiteConnection',
!            'DBMConnection', 'SybaseConnection']
  
  _connections = {}
***************
*** 605,608 ****
--- 616,720 ----
          # turn it into a boolean:
          return not not result
+ 
+ class SybaseConnection(DBAPI):
+ 
+     def __init__(self, db, user, passwd='', host='localhost', autoCommit=0, **kw):
+         assert Sybase, 'Sybase module cannot be found'
+         if not autoCommit and not kw.has_key('pool'):
+             # Pooling doesn't work with transactions...
+             kw['pool'] = 0
+         self.autoCommit=autoCommit
+         self.host = host
+         self.db = db
+         self.user = user
+         self.passwd = passwd
+         DBAPI.__init__(self, **kw)
+ 
+     def insert_id(self, conn):
+         """ Sybase adapter/cursor does not support the 
+             insert_id method. 
+         """
+         c = conn.cursor()
+         c.execute('SELECT @@IDENTITY')
+         return c.fetchone()[0]
+ 
+     def makeConnection(self):
+         return Sybase.connect(self.host, self.user, self.passwd,
+                               database=self.db, auto_commit=self.autoCommit)
+ 
+     def _queryInsertID(self, conn, table, idName, names, values):
+         c = conn.cursor()
+         q = self._insertSQL(table, names, values)
+         if self.debug:
+             print 'QueryIns: %s' % q
+         c.execute(q)
+         return self.insert_id(conn)
+ 
+     def _queryAddLimitOffset(self, query, start, end):
+         if not start:
+             return "%s LIMIT %i" % (query, end)
+         if not end:
+             return "%s LIMIT %i, -1" % (query, start)
+         return "%s LIMIT %i, %i" % (query, start, end-start)
+ 
+     def createColumn(self, soClass, col):
+         return col.sybaseCreateSQL()
+ 
+     def createIDColumn(self, soClass):
+         #return '%s INT PRIMARY KEY AUTO_INCREMENT' % soClass._idName
+         return '%s NUMERIC(18,0) IDENTITY' % soClass._idName
+ 
+     def joinSQLType(self, join):
+         return 'NUMERIC(18,0) NOT NULL' #INT NOT NULL'
+ 
+     SHOW_TABLES="""SELECT name FROM sysobjects WHERE type='U'"""
+     def tableExists(self, tableName):
+         for (table,) in self.queryAll(self.SHOW_TABLES):
+             if table.lower() == tableName.lower():
+                 return True
+         return False
+ 
+     def addColumn(self, tableName, column):
+         self.query('ALTER TABLE %s ADD COLUMN %s' %
+                    (tableName,
+                     column.sybaseCreateSQL()))
+ 
+     def delColumn(self, tableName, column):
+         self.query('ALTER TABLE %s DROP COLUMN %s' %
+                    (tableName,
+                     column.dbName))
+ 
+     SHOW_COLUMNS="""select 'column' = COL_NAME(id, colid)
+                     from syscolumns
+                     where id = OBJECT_ID(%s)
+     """
+     def columnsFromSchema(self, tableName, soClass):
+         colData = self.queryAll(self.SHOW_COLUMNS
+                                 % tableName)
+         results = []
+         for field, t, nullAllowed, key, default, extra in colData:
+             if field == 'id':
+                 continue
+             colClass, kw = self.guessClass(t)
+             kw['name'] = soClass._style.dbColumnToPythonAttr(field)
+             kw['notNone'] = not nullAllowed
+             kw['default'] = default
+             # @@ skip key...
+             # @@ skip extra...
+             results.append(colClass(**kw))
+         return results
+ 
+     def guessClass(self, t):
+         if t.startswith('int'):
+             return Col.IntCol, {}
+         elif t.startswith('varchar'):
+             return Col.StringCol, {'length': int(t[8:-1])}
+         elif t.startswith('char'):
+             return Col.StringCol, {'length': int(t[5:-1]),
+                                    'varchar': False}
+         elif t.startswith('datetime'):
+             return Col.DateTimeCol, {}
+         else:
+             return Col.Col, {}
  
  ########################################

Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -C2 -d -r1.50 -r1.50.2.1
*** SQLObject.py	1 Aug 2003 01:19:34 -0000	1.50
--- SQLObject.py	19 Aug 2003 12:53:10 -0000	1.50.2.1
***************
*** 801,804 ****
--- 801,805 ----
  
          # Then we finalize the process:
+         #import pdb; pdb.set_trace()
          inst._SO_finishCreate()
          return inst

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

Modified Files:
	SQLObjectTest.py 
Log Message:
Added missing attribute supportsTransactions


Index: SQLObjectTest.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/SQLObjectTest.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SQLObjectTest.py	21 Apr 2003 22:37:17 -0000	1.9
--- SQLObjectTest.py	1 Aug 2003 01:29:28 -0000	1.10
***************
*** 10,13 ****
--- 10,15 ----
      # care when you assign incorrect to an ENUM...
      SQLObjectTest.supportRestrictedEnum = False
+     # Technically it does, but now how we're using it:
+     SQLObjectTest.supportTransactions = False
      return MySQLConnection(host='localhost',
                             db='test',
***************
*** 20,23 ****
--- 22,26 ----
      SQLObjectTest.supportAuto = False
      SQLObjectTest.supportRestrictedEnum = False
+     SQLObjectTest.supportTransactions = False
      return DBMConnection('data')
  
***************
*** 26,29 ****
--- 29,33 ----
      SQLObjectTest.supportAuto = True
      SQLObjectTest.supportRestrictedEnum = True
+     SQLObjectTest.supportTransactions = True
      return PostgresConnection(db='test')
  
***************
*** 32,35 ****
--- 36,40 ----
      SQLObjectTest.supportAuto = False
      SQLObjectTest.supportRestrictedEnum = False
+     SQLObjectTest.supportTransactions = True
      return SQLiteConnection('data/sqlite.data')
  

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

Modified Files:
	SQLBuilder.py 
Log Message:
Make sure __getattr__ doesn't catch magic methods


Index: SQLBuilder.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLBuilder.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SQLBuilder.py	31 Jul 2003 14:25:32 -0000	1.10
--- SQLBuilder.py	1 Aug 2003 01:29:46 -0000	1.11
***************
*** 302,305 ****
--- 302,307 ----
  class TableSpace:
      def __getattr__(self, attr):
+         if attr.startswith('__'):
+             raise AttributeError
          return Table(attr)
  
***************
*** 308,311 ****
--- 310,315 ----
          self.tableName = tableName
      def __getattr__(self, attr):
+         if attr.startswith('__'):
+             raise AttributeError
          return Field(self.tableName, attr)
      def sqlRepr(self):
***************
*** 321,324 ****
--- 325,330 ----
  
      def __getattr__(self, attr):
+         if attr.startswith('__'):
+             raise AttributeError
          if attr == 'id':
              return SQLObjectField(self.tableName, self.soClass._idName, attr)
***************
*** 348,351 ****
--- 354,359 ----
  class ConstantSpace:
      def __getattr__(self, attr):
+         if attr.startswith('__'):
+             raise AttributeError
          return SQLConstant(attr)
  

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

Modified Files:
	Converters.py 
Log Message:
Make sqlRepr look for magic sqlRepr method


Index: Converters.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Converters.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Converters.py	18 Jul 2003 03:15:50 -0000	1.1
--- Converters.py	1 Aug 2003 01:30:09 -0000	1.2
***************
*** 95,102 ****
  
  def sqlRepr(obj):
!     converter = lookupConverter(obj)
!     if converter is None:
!         raise ValueError, "Unknown SQL builtin type: %s for %s" % \
!               (type(obj), repr(obj))
!     return converter(obj)
  
--- 95,107 ----
  
  def sqlRepr(obj):
!     try:
!         reprFunc = obj.sqlRepr
!     except AttributeError:
!         converter = lookupConverter(obj)
!         if converter is None:
!             raise ValueError, "Unknown SQL builtin type: %s for %s" % \
!                   (type(obj), repr(obj))
!         return converter(obj)
!     else:
!         return reprFunc()
  

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

Modified Files:
	SQLObject.py 
Log Message:
Added test in addNeedSet so we won't re-set an already set class
(which causes an error for obscure reasons).


Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** SQLObject.py	18 Jul 2003 03:15:50 -0000	1.49
--- SQLObject.py	1 Aug 2003 01:19:34 -0000	1.50
***************
*** 100,104 ****
          cls = findClass(setCls, registry=registry)
          if callable(getattr(obj, attr, None)):
!             getattr(obj, attr)(cls)
          else:
              setattr(obj, attr, cls)
--- 100,107 ----
          cls = findClass(setCls, registry=registry)
          if callable(getattr(obj, attr, None)):
!             if not isinstance(getattr(obj, attr), type):
!                 # Otherwise we got a class, which means we probably
!                 # already set this column.
!                 getattr(obj, attr)(cls)
          else:
              setattr(obj, attr, cls)

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

Modified Files:
	SQLBuilder.py 
Log Message:
More tests and converters for the SQLExpression-basec classes

Index: SQLBuilder.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLBuilder.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SQLBuilder.py	30 Jul 2003 21:07:45 -0000	1.9
--- SQLBuilder.py	31 Jul 2003 14:25:32 -0000	1.10
***************
*** 242,245 ****
--- 242,247 ----
                                                  execute(self.expr2, executor))
  
+ registerConverter(SQLOp, SQLExprConverter)
+ 
  class SQLCall(SQLExpression):
      def __init__(self, expr, args):
***************
*** 253,256 ****
--- 255,260 ----
          raise ValueError, "I don't yet know how to locally execute functions"
  
+ registerConverter(SQLCall, SQLExprConverter)
+ 
  class SQLPrefix(SQLExpression):
      def __init__(self, prefix, expr):
***************
*** 270,273 ****
--- 274,279 ----
              return not expr
  
+ registerConverter(SQLPrefix, SQLExprConverter)
+ 
  class SQLConstant(SQLExpression):
      def __init__(self, const):
***************
*** 278,281 ****
--- 284,289 ----
          raise ValueError, "I don't yet know how to execute SQL constants"
  
+ registerConverter(SQLConstant, SQLExprConverter)
+ 
  class SQLTrueClauseClass(SQLExpression):
      def sqlRepr(self):
***************
*** 285,288 ****
--- 293,298 ----
  
  SQLTrueClause = SQLTrueClauseClass()
+ 
+ registerConverter(SQLTrueClauseClass, SQLExprConverter)
  
  ########################################

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

Modified Files:
	test_converters.py 
Log Message:
More tests and converters for the SQLExpression-basec classes

Index: test_converters.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test_converters.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_converters.py	30 Jul 2003 21:07:45 -0000	1.2
--- test_converters.py	31 Jul 2003 14:25:33 -0000	1.3
***************
*** 2,6 ****
  from SQLObject.SQLBuilder import sqlRepr
  from SQLObject.SQLBuilder import SQLExpression, SQLObjectField, \
!      Select, Insert, Update, Delete, Replace
  from SQLObject.Converters import registerConverter
  
--- 2,7 ----
  from SQLObject.SQLBuilder import sqlRepr
  from SQLObject.SQLBuilder import SQLExpression, SQLObjectField, \
!      Select, Insert, Update, Delete, Replace, \
!      SQLTrueClauseClass, SQLConstant, SQLPrefix, SQLCall, SQLOp
  from SQLObject.Converters import registerConverter
  
***************
*** 107,110 ****
--- 108,131 ----
      def test_replace(self):
          instance = Replace('test', {'test':'test'})
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_trueclause(self):
+         instance = SQLTrueClauseClass()
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_op(self):
+         instance = SQLOp('and', 'this', 'that')
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_call(self):
+         instance = SQLCall('test', 'test')
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_constant(self):
+         instance = SQLConstant('test')
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_prefix(self):
+         instance = SQLPrefix('test', 'test')
          self.assertEqual(sqlRepr(instance), repr(instance))
  

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

Modified Files:
	test_converters.py 
Log Message:
Fix the problem with the 'magic q' and add a few more tests. Also register a few more converters while we're at it.

Index: test_converters.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test_converters.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_converters.py	18 Jul 2003 03:15:52 -0000	1.1
--- test_converters.py	30 Jul 2003 21:07:45 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  import unittest
  from SQLObject.SQLBuilder import sqlRepr
+ from SQLObject.SQLBuilder import SQLExpression, SQLObjectField, \
+      Select, Insert, Update, Delete, Replace
  from SQLObject.Converters import registerConverter
  
***************
*** 13,16 ****
--- 15,35 ----
  registerConverter(TestClass, TestClassConverter)
  
+ class NewTestClass:
+ 
+     __metaclass__ = type
+ 
+     def __repr__(self):
+         return '<NewTestClass>'
+ 
+ def NewTestClassConverter(value):
+     return repr(value)
+ 
+ registerConverter(NewTestClass, NewTestClassConverter)
+ 
+ def _sqlRepr(self):
+     return '<%s>' % self.__class__.__name__
+ 
+ SQLExpression.sqlRepr = _sqlRepr
+ 
  class ConvertersTest(unittest.TestCase):
  
***************
*** 56,59 ****
--- 75,110 ----
      def test_instance(self):
          instance = TestClass()
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_newstyle(self):
+         instance = NewTestClass()
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_sqlexpr(self):
+         instance = SQLExpression()
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_sqlobjectfield(self):
+         instance = SQLObjectField('test', 'test', 'test')
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_select(self):
+         instance = Select('test')
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_insert(self):
+         instance = Insert('test', ('test',))
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_update(self):
+         instance = Update('test', {'test':'test'})
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_delete(self):
+         instance = Delete('test', None)
+         self.assertEqual(sqlRepr(instance), repr(instance))
+ 
+     def test_replace(self):
+         instance = Replace('test', {'test':'test'})
          self.assertEqual(sqlRepr(instance), repr(instance))
  

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

Modified Files:
	SQLBuilder.py 
Log Message:
Fix the problem with the 'magic q' and add a few more tests. Also register a few more converters while we're at it.

Index: SQLBuilder.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLBuilder.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SQLBuilder.py	18 Jul 2003 03:15:50 -0000	1.8
--- SQLBuilder.py	30 Jul 2003 21:07:45 -0000	1.9
***************
*** 334,337 ****
--- 334,339 ----
          Field.__init__(self, tableName, fieldName)
  
+ registerConverter(SQLObjectField, SQLExprConverter)
+ 
  class ConstantSpace:
      def __getattr__(self, attr):
***************
*** 381,384 ****
--- 383,388 ----
          return select
  
+ registerConverter(Select, SQLExprConverter)
+ 
  class Insert(SQLExpression):
      def __init__(self, table, valueList=None, values=None, template=NoDefault):
***************
*** 418,421 ****
--- 422,427 ----
          return insert
  
+ registerConverter(Insert, SQLExprConverter)
+ 
  def dictToList(template, dict):
      list = []
***************
*** 456,459 ****
--- 462,467 ----
          return "UPDATE"
  
+ registerConverter(Update, SQLExprConverter)
+  
  class Delete(SQLExpression):
      """To be safe, this will signal an error if there is no where clause,
***************
*** 470,476 ****
--- 478,488 ----
                 % (self.table, sqlRepr(self.whereClause))
  
+ registerConverter(Delete, SQLExprConverter)
+ 
  class Replace(Update):
      def sqlName(self):
          return "REPLACE"
+ 
+ registerConverter(Replace, SQLExprConverter)
  
  ########################################

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

Modified Files:
	MANIFEST.in 
Log Message:
More explicit about files to include in distributions


Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/MANIFEST.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MANIFEST.in	13 Mar 2003 20:56:39 -0000	1.2
--- MANIFEST.in	18 Jul 2003 03:26:31 -0000	1.3
***************
*** 2,6 ****
  include *.html
  include *.css
! recursive-include examples *.txt *.py
! recursive-include docs *.txt *.html *.css
  recursive-include tests *.py
--- 2,8 ----
  include *.html
  include *.css
! include examples/*.py
! include docs/*.txt
! include docs/*.html
! include docs/*.css
  recursive-include tests *.py

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

Modified Files:
	DBConnection.py SQLBuilder.py SQLObject.py 
Added Files:
	Converters.py 
Log Message:
Refactored sqlRepr function into a separate module and added some tests. Also, some whitespace cleaning as I go visiting files.

--- NEW FILE: Converters.py ---
try:
    import mx.DateTime.ISO
    origISOStr = mx.DateTime.ISO.strGMT
    from mx.DateTime import DateTimeType
except ImportError:
    try:
        import DateTime.ISO
        origISOStr = DateTime.ISO.strGMT
        from DateTime import DateTimeType
    except ImportError:
        origISOStr = None
        DateTimeType = None

from types import InstanceType, ClassType, TypeType

########################################
## Quoting
########################################

sqlStringReplace = [
    ('\\', '\\\\'),
    ('\'', '\\\''),
    ('\000', '\\0'),
    ('\b', '\\b'),
    ('\n', '\\n'),
    ('\r', '\\r'),
    ('\t', '\\t'),
    ]

def isoStr(val):
    """Gets rid of time zone information"""
    val = origISOStr(val)
    if val.find('+') == -1:
        return val
    else:
        return val[:val.find('+')]

class ConverterRegistry:

    def __init__(self):
        self.basic = {}
        self.klass = {}

    def registerConverter(self, typ, func):
        if type(typ) is ClassType:
            self.klass[typ] = func
        else:
            self.basic[typ] = func

    def lookupConverter(self, value, default=None):
        if type(value) == InstanceType:
            # lookup on klasses dict
            return self.klass.get(value.__class__, default)
        return self.basic.get(type(value), default)

converters = ConverterRegistry()
registerConverter = converters.registerConverter
lookupConverter = converters.lookupConverter

def StringLikeConverter(value):
    for orig, repl in sqlStringReplace:
        value = value.replace(orig, repl)
    return "'%s'" % value

registerConverter(type(""), StringLikeConverter)
registerConverter(type(u""), StringLikeConverter)

def IntConverter(value):
    return repr(int(value))

registerConverter(type(1), IntConverter)
registerConverter(type(0L), IntConverter)

def FloatConverter(value):
    return repr(value)

registerConverter(type(1.0), FloatConverter)

if DateTimeType:
    def DateTimeConverter(value):
        return "'%s'" % isoStr(value)

    registerConverter(DateTimeType, DateTimeConverter)

def NoneConverter(value):
    return "NULL"

registerConverter(type(None), NoneConverter)

def SequenceConverter(value):
    return "(%s)" % ", ".join(map(sqlRepr, value))

registerConverter(type(()), SequenceConverter)
registerConverter(type([]), SequenceConverter)

def sqlRepr(obj):
    converter = lookupConverter(obj)
    if converter is None:
        raise ValueError, "Unknown SQL builtin type: %s for %s" % \
              (type(obj), repr(obj))
    return converter(obj)


Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** DBConnection.py	15 Jul 2003 02:27:19 -0000	1.40
--- DBConnection.py	18 Jul 2003 03:15:50 -0000	1.41
***************
*** 471,475 ****
                    % (idName, table, c.lastoid()))
          return c.fetchone()[0]
!         
      def _queryAddLimitOffset(self, query, start, end):
          if not start:
--- 471,475 ----
                    % (idName, table, c.lastoid()))
          return c.fetchone()[0]
! 
      def _queryAddLimitOffset(self, query, start, end):
          if not start:
***************
*** 481,485 ****
      def createColumn(self, soClass, col):
          return col.postgresCreateSQL()
!     
      def createIDColumn(self, soClass):
          return '%s SERIAL PRIMARY KEY' % soClass._idName
--- 481,485 ----
      def createColumn(self, soClass, col):
          return col.postgresCreateSQL()
! 
      def createIDColumn(self, soClass):
          return '%s SERIAL PRIMARY KEY' % soClass._idName
***************
*** 505,509 ****
  
      def columnsFromSchema(self, tableName, soClass):
!         
          keyQuery = """
          SELECT pg_catalog.pg_get_constraintdef(oid) as condef
--- 505,509 ----
  
      def columnsFromSchema(self, tableName, soClass):
! 
          keyQuery = """
          SELECT pg_catalog.pg_get_constraintdef(oid) as condef
***************
*** 568,572 ****
              # Pooling doesn't work with transactions...
              kw['pool'] = 0
!         # use only one connection for sqlite - supports multiple 
          # cursors per connection
          self._conn = sqlite.connect(self.filename)
--- 568,572 ----
              # Pooling doesn't work with transactions...
              kw['pool'] = 0
!         # use only one connection for sqlite - supports multiple
          # cursors per connection
          self._conn = sqlite.connect(self.filename)
***************
*** 627,631 ****
      * ``_SO_createJoinTable(join)``
      """
!     
      def queryInsertID(self, table, idName, names, values):
          id = self._newID(table)
--- 627,631 ----
      * ``_SO_createJoinTable(join)``
      """
! 
      def queryInsertID(self, table, idName, names, values):
          id = self._newID(table)
***************
*** 819,823 ****
          else:
              db[join2 + str(id2)] = str(id1)
!         
      def _SO_intermediateDelete(self, table, join1, id1, join2, id2):
          db = self._openTable(table)
--- 819,823 ----
          else:
              db[join2 + str(id2)] = str(id1)
! 
      def _SO_intermediateDelete(self, table, join1, id1, join2, id2):
          db = self._openTable(table)
***************
*** 877,881 ****
              except IndexError:
                  raise StopIteration
!             
          for idList in self.comboIter:
              self.idList = idList
--- 877,881 ----
              except IndexError:
                  raise StopIteration
! 
          for idList in self.comboIter:
              self.idList = idList
***************
*** 897,901 ****
              except StopIteration:
                  return results
!     
  
  def _iterAllCombinations(l):
--- 897,901 ----
              except StopIteration:
                  return results
! 
  
  def _iterAllCombinations(l):

Index: SQLBuilder.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLBuilder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SQLBuilder.py	5 Jul 2003 03:49:52 -0000	1.7
--- SQLBuilder.py	18 Jul 2003 03:15:50 -0000	1.8
***************
*** 68,129 ****
  True, False = (1==1), (0==1)
  
- ########################################
- ## Quoting
- ########################################
- 
- sqlStringReplace = [
-     ('\\', '\\\\'),
-     ('\'', '\\\''),
-     ('\000', '\\0'),
-     ('\b', '\\b'),
-     ('\n', '\\n'),
-     ('\r', '\\r'),
-     ('\t', '\\t'),
-     ]
- 
- try:
-     import mx.DateTime.ISO
-     origISOStr = mx.DateTime.ISO.strGMT
-     from mx.DateTime import DateTimeType
- except ImportError:
-     try:
-         import DateTime.ISO
-         origISOStr = DateTime.ISO.strGMT
-         from DateTime import DateTimeType
-     except ImportError:
-         origISOStr = None
-         DateTimeType = None
  import re, fnmatch
  import operator
! 
! def isoStr(val):
!     """Gets rid of time zone information"""
!     val = origISOStr(val)
!     if val.find('+') == -1:
!         return val
!     else:
!         return val[:val.find('+')]
! 
! def sqlRepr(obj):
!     t = type(obj)
!     if isinstance(obj, SQLExpression):
!         return obj.sqlRepr()
!     elif t is type("") or t is type(u""):
!         for orig, repl in sqlStringReplace:
!             obj = obj.replace(orig, repl)
!         return "'%s'" % obj
!     elif t is type(0L) or t is type(1):
!         return repr(int(obj))
!     elif t is type(1.0):
!         return repr(obj)
!     elif DateTimeType and t is DateTimeType:
!         return "'%s'" % isoStr(obj)
!     elif obj is None:
!         return "NULL"
!     elif t is type(()) or t is type([]):
!         return "(%s)" % ", ".join(map(sqlRepr, obj))
!     else:
!         raise ValueError, "Unknown SQL builtin type: %s for %s" % \
!               (t, repr(obj))
  
  safeSQLRE = re.compile(r'^[a-zA-Z][a-zA-Z0-9_\.]*$')
--- 68,74 ----
  True, False = (1==1), (0==1)
  
  import re, fnmatch
  import operator
! from Converters import sqlRepr, registerConverter
  
  safeSQLRE = re.compile(r'^[a-zA-Z][a-zA-Z0-9_\.]*$')
***************
*** 237,240 ****
--- 182,194 ----
          return []
  
+ #######################################
+ # Converter for SQLExpression instances
+ #######################################
+ 
+ def SQLExprConverter(value):
+     return value.sqlRepr()
+ 
+ registerConverter(SQLExpression, SQLExprConverter)
+ 
  def tablesUsedDict(obj):
      if hasattr(obj, "tablesUsedDict"):
***************
*** 414,418 ****
          if tables:
              select += " FROM %s" % ", ".join(tables)
!         
          if self.whereClause is not NoDefault:
              select += " WHERE %s" % sqlRepr(self.whereClause)
--- 368,372 ----
          if tables:
              select += " FROM %s" % ", ".join(tables)
! 
          if self.whereClause is not NoDefault:
              select += " WHERE %s" % sqlRepr(self.whereClause)

Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** SQLObject.py	17 Jul 2003 01:23:57 -0000	1.48
--- SQLObject.py	18 Jul 2003 03:15:50 -0000	1.49
***************
*** 76,80 ****
                  newNeedList.append((needClass, setCls))
          needSet[registryName] = newNeedList
!     
  def setNeedSet():
      global needSet
--- 76,80 ----
                  newNeedList.append((needClass, setCls))
          needSet[registryName] = newNeedList
! 
  def setNeedSet():
      global needSet
***************
*** 117,121 ****
  
      def __new__(cls, className, bases, d):
!         
          global classRegistry, needSet
  
--- 117,121 ----
  
      def __new__(cls, className, bases, d):
! 
          global classRegistry, needSet
  
***************
*** 496,500 ****
                  setattr(cls, setterName(name)[:-2], setter)
                  cls._SO_plainForeignSetters[name[:-2]] = 1
!                 
              # We'll need to put in a real reference at
              # some point.  See needSet at the top of the
--- 496,500 ----
                  setattr(cls, setterName(name)[:-2], setter)
                  cls._SO_plainForeignSetters[name[:-2]] = 1
! 
              # We'll need to put in a real reference at
              # some point.  See needSet at the top of the
***************
*** 570,574 ****
          meth = join.joinMethodName
          cls._SO_joinDict[joinDef] = join
!         
          cls._SO_joinList.append(join)
          index = len(cls._SO_joinList)-1
--- 570,574 ----
          meth = join.joinMethodName
          cls._SO_joinDict[joinDef] = join
! 
          cls._SO_joinList.append(join)
          index = len(cls._SO_joinList)-1
***************
*** 664,669 ****
                  raise SQLObjectNotFound, "The object %s by the ID %s does not exist" % (self.__class__.__name__, self.id)
          self._SO_selectInit(selectResults)
!     
!         
      def _SO_setValue(self, name, value):
          # This is the place where we actually update the
--- 664,669 ----
                  raise SQLObjectNotFound, "The object %s by the ID %s does not exist" % (self.__class__.__name__, self.id)
          self._SO_selectInit(selectResults)
! 
! 
      def _SO_setValue(self, name, value):
          # This is the place where we actually update the
***************
*** 681,688 ****
                                      [(self._SO_columnDict[name].dbName,
                                        value)])
!         
          if self._cacheValues:
              setattr(self, instanceName(name), value)
!             
      def set(self, **kw):
          # set() is used to update multiple values at once,
--- 681,688 ----
                                      [(self._SO_columnDict[name].dbName,
                                        value)])
! 
          if self._cacheValues:
              setattr(self, instanceName(name), value)
! 
      def set(self, **kw):
          # set() is used to update multiple values at once,
***************
*** 693,697 ****
              self._SO_createValues.update(kw)
              return
!         
          self._SO_writeLock.acquire()
  
--- 693,697 ----
              self._SO_createValues.update(kw)
              return
! 
          self._SO_writeLock.acquire()
  
***************
*** 730,734 ****
          assert results != None, "%s with id %s is not in the database" \
                 % (self.__class__.__name__, self.id)
!         return results[0]        
  
      def _SO_foreignKey(self, id, joinClass):
--- 730,734 ----
          assert results != None, "%s with id %s is not in the database" \
                 % (self.__class__.__name__, self.id)
!         return results[0]
  
      def _SO_foreignKey(self, id, joinClass):
***************
*** 756,760 ****
          # passed:
          for column in inst._SO_columns:
!             
              # If a foreign key is given, we get the ID of the object
              # and put that in instead
--- 756,760 ----
          # passed:
          for column in inst._SO_columns:
! 
              # If a foreign key is given, we get the ID of the object
              # and put that in instead
***************
*** 813,817 ****
          del self._SO_createValues
          del self._SO_creating
!         
          # Do the insert -- most of the SQL in this case is left
          # up to DBConnection, since getting a new ID is
--- 813,817 ----
          del self._SO_createValues
          del self._SO_creating
! 
          # Do the insert -- most of the SQL in this case is left
          # up to DBConnection, since getting a new ID is
***************
*** 831,835 ****
              [cls._idName] +
              [col.dbName for col in cls._SO_columns],
!             dbIDName, 
              value)
          if not result:
--- 831,835 ----
              [cls._idName] +
              [col.dbName for col in cls._SO_columns],
!             dbIDName,
              value)
          if not result:
***************
*** 915,919 ****
          cls._connection.clearTable(cls._table)
      clearTable = classmethod(clearTable)
!         
      def destroySelf(self):
          # Kills this object.  Kills it dead!
--- 915,919 ----
          cls._connection.clearTable(cls._table)
      clearTable = classmethod(clearTable)
! 
      def destroySelf(self):
          # Kills this object.  Kills it dead!
***************
*** 925,929 ****
          obj = cls(id)
          obj.destroySelf()
!     
      delete = classmethod(delete)
  
--- 925,929 ----
          obj = cls(id)
          obj.destroySelf()
! 
      delete = classmethod(delete)
  
***************
*** 958,962 ****
  def instanceName(name):
      return '_SO_val_%s' % name
!         
  
  class SelectResults(object):
--- 958,962 ----
  def instanceName(name):
      return '_SO_val_%s' % name
! 
  
  class SelectResults(object):
***************
*** 1088,1093 ****
              count = min(self.ops['end'] - self.ops.get('start', 0), count)
          return count
!             
!         
  
  
--- 1088,1093 ----
              count = min(self.ops['end'] - self.ops.get('start', 0), count)
          return count
! 
! 
  
  

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

Modified Files:
	test_cache.py 
Added Files:
	test_converters.py 
Log Message:
Refactored sqlRepr function into a separate module and added some tests. Also, some whitespace cleaning as I go visiting files.

--- NEW FILE: test_converters.py ---
import unittest
from SQLObject.SQLBuilder import sqlRepr
from SQLObject.Converters import registerConverter

class TestClass:

    def __repr__(self):
        return '<TestClass>'

def TestClassConverter(value):
    return repr(value)

registerConverter(TestClass, TestClassConverter)

class ConvertersTest(unittest.TestCase):

    def test_simple_string(self):
        self.assertEqual(sqlRepr('A String'), "'A String'")

    def test_string_newline(self):
        self.assertEqual(sqlRepr('A String\nAnother'), "'A String\\nAnother'")

    def test_string_tab(self):
        self.assertEqual(sqlRepr('A String\tAnother'), "'A String\\tAnother'")

    def test_string_r(self):
        self.assertEqual(sqlRepr('A String\rAnother'), "'A String\\rAnother'")

    def test_string_b(self):
        self.assertEqual(sqlRepr('A String\bAnother'), "'A String\\bAnother'")

    def test_string_000(self):
        self.assertEqual(sqlRepr('A String\000Another'), "'A String\\0Another'")

    def test_string_(self):
        self.assertEqual(sqlRepr('A String\'Another'), "'A String\\\'Another'")

    def test_simple_unicode(self):
        self.assertEqual(sqlRepr(u'A String'), "'A String'")

    def test_integer(self):
        self.assertEqual(sqlRepr(10), "10")

    def test_float(self):
        self.assertEqual(sqlRepr(10.01), "10.01")

    def test_none(self):
        self.assertEqual(sqlRepr(None), "NULL")

    def test_list(self):
        self.assertEqual(sqlRepr(['one','two','three']), "('one', 'two', 'three')")

    def test_tuple(self):
        self.assertEqual(sqlRepr(('one','two','three')), "('one', 'two', 'three')")

    def test_instance(self):
        instance = TestClass()
        self.assertEqual(sqlRepr(instance), repr(instance))

if __name__ == "__main__":
    unittest.main()

Index: test_cache.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test_cache.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_cache.py	17 Apr 2003 02:58:39 -0000	1.1
--- test_cache.py	18 Jul 2003 03:15:52 -0000	1.2
***************
*** 5,9 ****
      pass
  
- 
  class CacheTest(unittest.TestCase):
  
--- 5,8 ----
***************
*** 24,28 ****
          self.assertEqual(j, None)
          x.finishPut(y.__class__)
-         
  
  if __name__ == "__main__":
--- 23,26 ----

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

Modified Files:
	SQLObject.py 
Log Message:
Fixed up single-value __getitem__ access to SelectResults


Index: SQLObject.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/SQLObject.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** SQLObject.py	10 Jul 2003 19:16:07 -0000	1.47
--- SQLObject.py	17 Jul 2003 01:23:57 -0000	1.48
***************
*** 1033,1036 ****
--- 1033,1040 ----
                  # No need to copy, I'm immutable
                  return self
+ 
+             # Negative indexes aren't handled (and everything we
+             # don't handle ourselves we just create a list to
+             # handle)
              if (value.start and value.start < 0) \
                 or (value.stop and value.stop < 0):
***************
*** 1040,1049 ****
                      return list(self)[value.start:]
                  return list(self)[:value.stop]
              if value.start:
!                 assert value.start >= 0, "Negative index not supported (%s)" % value.start
                  start = self.ops.get('start', 0) + value.start
                  if value.stop is not None:
!                     assert value.stop >= 0, "Negative indexes not supported (%s)" % value.stop
                      if value.stop < value.start:
                          end = start
                      else:
--- 1044,1056 ----
                      return list(self)[value.start:]
                  return list(self)[:value.stop]
+ 
+             
              if value.start:
!                 assert value.start >= 0
                  start = self.ops.get('start', 0) + value.start
                  if value.stop is not None:
!                     assert value.stop >= 0
                      if value.stop < value.start:
+                         # an empty result:
                          end = start
                      else:
***************
*** 1051,1054 ****
--- 1058,1062 ----
                          if self.ops.get('end', None) is not None \
                             and value['end'] < end:
+                             # truncated by previous slice:
                              end = self.ops['end']
                  else:
***************
*** 1065,1069 ****
                  return list(iter(self))[value]
              else:
!                 return list(self.clone(start=value, stop=value+1))[0]
  
      def __iter__(self):
--- 1073,1078 ----
                  return list(iter(self))[value]
              else:
!                 start = self.ops.get('start', 0) + value
!                 return list(self.clone(start=start, end=start+1))[0]
  
      def __iter__(self):

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

Modified Files:
	test.py 
Log Message:
Added iteration test


Index: test.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** test.py	10 Jul 2003 19:25:47 -0000	1.20
--- test.py	17 Jul 2003 01:20:18 -0000	1.21
***************
*** 2,5 ****
--- 2,6 ----
  from SQLObject import *
  from mx import DateTime
+ from __future__ import generators
  
  ########################################
***************
*** 128,131 ****
--- 129,197 ----
                            ('joe', 'robbins'), ('tim', 'jackson'),
                            ('zoe', 'robbins')])
+ 
+ ########################################
+ ## Select results
+ ########################################
+ 
+ class IterTest(SQLObject):
+     name = StringCol()
+     
+ class IterationTestCase(SQLObjectTest):
+     '''Test basic iteration techniques'''
+ 
+     classes = [IterTest]
+ 
+     names = ('a', 'b', 'c')
+ 
+     def inserts(self):
+         for name in self.names:
+             IterTest.new(name=name)
+ 
+     def test_00_normal(self):
+         count = 0
+         for test in IterTest.select():
+             count += 1
+         self.failIf(count != len(self.names))
+ 
+     def test_01_turn_to_list(self):
+         count = 0
+         for test in list(IterTest.select()):
+             count += 1
+         self.failIf(count != len(self.names))
+ 
+     def test_02_generator(self):
+         def enumerate(iterable):
+             i = 0
+             for obj in iterable:
+                 yield i, obj
+                 i += 1
+         all = IterTest.select()
+         count = 0
+         for i, test in enumerate(all):
+             count += 1
+         self.failIf(count != len(self.names))
+ 
+     def test_03_ranged_indexed(self):
+         all = IterTest.select()
+         count = 0
+         for i in range(len(all)):
+             test = all[i]
+             count += 1
+         self.failIf(count != len(self.names))
+ 
+     def test_04_indexed_ended_by_exception(self):
+         all = IterTest.select()
+         count = 0
+         try:
+             while 1:
+                 test = all[count]
+                 count = count+1
+                 # Stop the test if it's gone on too long
+                 if count > len(self.names):
+                     break
+         except IndexError:
+             pass
+         self.failIf(count != len(self.names))
+ 
  
  ########################################

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

Modified Files:
	DBConnection.py 
Log Message:
Fixed typo in guessClass


Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** DBConnection.py	10 Jul 2003 19:27:50 -0000	1.39
--- DBConnection.py	15 Jul 2003 02:27:19 -0000	1.40
***************
*** 433,437 ****
              return Col.DateTimeCol, {}
          else:
!             return Col, {}
  
  
--- 433,437 ----
              return Col.DateTimeCol, {}
          else:
!             return Col.Col, {}
  
  

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

Modified Files:
	Cache.py 
Log Message:
typo in purge


Index: Cache.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Cache.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Cache.py	5 May 2003 20:42:08 -0000	1.7
--- Cache.py	15 Jul 2003 02:25:31 -0000	1.8
***************
*** 138,142 ****
          self.lock.acquire()
          for key, value in self.cache.items():
!             self.expiredCache[id] = ref(obj)
          self.cache = {}
          self.lock.release()
--- 138,142 ----
          self.lock.acquire()
          for key, value in self.cache.items():
!             self.expiredCache[key] = ref(obj)
          self.cache = {}
          self.lock.release()

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

Modified Files:
	Style.py 
Log Message:
Define true and false for old 2.2 interpreters


Index: Style.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/Style.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Style.py	28 Jun 2003 22:20:37 -0000	1.4
--- Style.py	15 Jul 2003 02:16:07 -0000	1.5
***************
*** 4,7 ****
--- 4,9 ----
             "MixedCaseStyle"]
  
+ True, False = 1==1, 0==1
+ 
  class Style(object):
  

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):

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

Modified Files:
	test.py 
Log Message:
Added test for lists of orderBy


Index: test.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test.py	28 Jun 2003 22:20:55 -0000	1.18
--- test.py	10 Jul 2003 19:16:52 -0000	1.19
***************
*** 96,101 ****
          
          
!         
  
  
  ########################################
--- 96,131 ----
          
          
! ########################################
! ## Fancy sort
! ########################################
! 
! class Names(SQLObject):
! 
!     fname = StringCol(length=30)
!     lname = StringCol(length=30)
! 
!     _defaultOrder = ['lname', 'fname']
! 
! class NamesTest(SQLObjectTest):
! 
!     classes = [Names]
! 
!     def inserts(self):
!         for fname, lname in [('aj', 'baker'), ('joe', 'robbins'),
!                              ('tim', 'jackson'), ('joe', 'baker'),
!                              ('zoe', 'robbins')]:
!             Names.new(fname=fname, lname=lname)
! 
!     def testDefaultOrder(self):
!         self.assertEqual([(n.fname, n.lname) for n in Names.select()],
!                          [('aj', 'baker'), ('joe', 'baker'),
!                           ('tim', 'jackson'), ('joe', 'robbins'),
!                           ('zoe', 'robbins')])
  
+     def testOtherOrder(self):
+         self.assertEqual([(n.fname, n.lname) for n in Names.select().orderBy(['fname', 'lname'])],
+                          [('aj', 'baker'), ('joe', 'baker'),
+                           ('joe', 'robbins'), ('tim', 'jackson'),
+                           ('zoe', 'robbins')])
  
  ########################################

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

Modified Files:
	test.py 
Log Message:
Added transaction test


Index: test.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/tests/test.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test.py	10 Jul 2003 19:16:52 -0000	1.19
--- test.py	10 Jul 2003 19:25:47 -0000	1.20
***************
*** 143,146 ****
--- 143,164 ----
          self.assertEqual(list(TestSO1.select('all')), [])
  
+ ########################################
+ ## Transaction test
+ ########################################
+ 
+ class TransactionTest(SQLObjectTest):
+ 
+     classes = [Names]
+ 
+     def inserts(self):
+         Names.new(fname='bob', lname='jones')
+ 
+     def testTransaction(self):
+         if not self.supportTransactions: return
+         trans = Names._connection.transaction()
+         Names.new(fname='joe', lname='jones', connection=trans)
+         trans.rollback()
+         self.assertEqual([n.fname for n in Names.select()],
+                          ['bob'])
          
  

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

Modified Files:
	DBConnection.py 
Log Message:
Added the (needed) cache object to Transaction


Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** DBConnection.py	10 Jul 2003 19:01:27 -0000	1.38
--- DBConnection.py	10 Jul 2003 19:27:50 -0000	1.39
***************
*** 50,53 ****
--- 50,54 ----
          self.debug = debug
          self.cache = CacheSet(cache=cache)
+         self.doCache = cache
          self.style = style
  
***************
*** 330,333 ****
--- 331,335 ----
          self._dbConnection = dbConnection
          self._connection = dbConnection.getConnection()
+         self.cache = CacheSet(cache=dbConnection.doCache)
  
      def query(self, s):
***************
*** 349,353 ****
          self.rollback()
          self._dbConnection.releaseConnection(self._connection)
!         
  class MySQLConnection(DBAPI):
  
--- 351,355 ----
          self.rollback()
          self._dbConnection.releaseConnection(self._connection)
! 
  class MySQLConnection(DBAPI):
  

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

Modified Files:
	SQLObject.txt 
Log Message:
typo (_cacheValue -> _cacheValues)


Index: SQLObject.txt
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/docs/SQLObject.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SQLObject.txt	28 Jun 2003 22:36:20 -0000	1.14
--- SQLObject.txt	10 Jul 2003 19:28:50 -0000	1.15
***************
*** 699,703 ****
  message to the `psycopg` connection.
  
! If you want to use transactions you should also turn `_cacheValue`
  off, like:
  
--- 699,703 ----
  message to the `psycopg` connection.
  
! If you want to use transactions you should also turn `_cacheValues`
  off, like:
  

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

Modified Files:
	DBConnection.py 
Log Message:
Added close method to DBMConnection, run that on __del__ or atexit.
Without the close, .db files are not written with new information.


Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** DBConnection.py	30 Jun 2003 22:43:06 -0000	1.37
--- DBConnection.py	10 Jul 2003 19:01:27 -0000	1.38
***************
*** 31,34 ****
--- 31,35 ----
  import re
  import warnings
+ import atexit
  
  warnings.filterwarnings("ignore", "DB-API extension cursor.lastrowid used")
***************
*** 705,708 ****
--- 706,711 ----
              self._meta = anydbm.open(os.path.join(path, "meta.db"), "c")
          self._tables = {}
+         atexit.register(self.close)
+         self._closed = 0
          FileConnection.__init__(self, **kw)
  
***************
*** 726,729 ****
--- 729,746 ----
              self._tables[table] = db
              return db
+ 
+     def close(self):
+         if self._closed:
+             return
+         self._closed = 1
+         self._meta.close()
+         del self._meta
+         for table in self._tables.values():
+             table.close()
+         del self._tables
+ 
+     def __del__(self):
+         FileConnection.__del__(self)
+         self.close()
  
      def _openTable(self, table):