Update of /cvsroot/sqlobject/SQLObject/SQLObject
In directory sc8-pr-cvs1:/tmp/cvs-serv1243/SQLObject
Modified Files:
DBConnection.py
Log Message:
Fixed some bugs for Postgres columnsFromSchema
Forgot to mention in last commit that SQLObject can take columns like:
class SomeObject(SQLObject):
someColumn = Col()
Index: DBConnection.py
===================================================================
RCS file: /cvsroot/sqlobject/SQLObject/SQLObject/DBConnection.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DBConnection.py 21 Apr 2003 22:37:16 -0000 1.23
--- DBConnection.py 21 Apr 2003 22:40:56 -0000 1.24
***************
*** 513,517 ****
keyData = self.queryAll(keyQuery % tableName)
! keyRE = re.compile("\((.)\) REFERENCES (.)\(")
keymap = {}
for (condef,) in keyData:
--- 513,517 ----
keyData = self.queryAll(keyQuery % tableName)
! keyRE = re.compile("\((.+)\) REFERENCES (.+)\(")
keymap = {}
for (condef,) in keyData:
***************
*** 520,524 ****
field, reftable = match.groups()
keymap[field] = reftable.capitalize()
- #print "keymap:", keymap
colData = self.queryAll(colQuery % tableName)
results = []
--- 520,523 ----
***************
*** 530,534 ****
kw['notNull'] = notnull
if defaultstr is not None:
! kw['default'] = eval(defaultstr)
if keymap.has_key(field):
kw['foreignKey'] = keymap[field]
--- 529,533 ----
kw['notNull'] = notnull
if defaultstr is not None:
! kw['default'] = getattr(SQLBuilder.const, defaultstr)
if keymap.has_key(field):
kw['foreignKey'] = keymap[field]
|
