Author: phd
Date: 2006-06-07 10:03:36 -0600 (Wed, 07 Jun 2006)
New Revision: 1801
Modified:
SQLObject/branches/0.7-bugfix/sqlobject/main.py
SQLObject/branches/0.7-bugfix/sqlobject/mysql/mysqlconnection.py
Log:
Merged two patches by Ivan Horvath <i.h...@al...> from the trunk:
convert default to int, convert unicode column names to ascii.
Modified: SQLObject/branches/0.7-bugfix/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/main.py 2006-06-07 16:02:47 UTC (rev 1800)
+++ SQLObject/branches/0.7-bugfix/sqlobject/main.py 2006-06-07 16:03:36 UTC (rev 1801)
@@ -420,6 +420,8 @@
conn = connection or soClass._connection
for columnDef in conn.columnsFromSchema(sqlmeta.table, soClass):
if columnDef.name not in sqlmeta.columnDefinitions:
+ if isinstance(columnDef.name, unicode):
+ columnDef.name = columnDef.name.encode('ascii')
sqlmeta.addColumn(columnDef)
addColumnsFromDatabase = classmethod(addColumnsFromDatabase)
Modified: SQLObject/branches/0.7-bugfix/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/mysql/mysqlconnection.py 2006-06-07 16:02:47 UTC (rev 1800)
+++ SQLObject/branches/0.7-bugfix/sqlobject/mysql/mysqlconnection.py 2006-06-07 16:03:36 UTC (rev 1801)
@@ -136,7 +136,10 @@
colClass, kw = self.guessClass(t)
kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
kw['notNone'] = not nullAllowed
- kw['default'] = default
+ if default and t.startswith('int'):
+ kw['default'] = int(default)
+ else:
+ kw['default'] = default
# @@ skip key...
# @@ skip extra...
results.append(colClass(**kw))
|
