Author: phd
Date: 2006-06-07 10:04:57 -0600 (Wed, 07 Jun 2006)
New Revision: 1802
Modified:
home/phd/SQLObject/paramstyles/sqlobject/main.py
home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 1797:1801 from the trunk: patches by Ivan Horvath <i.h...@al...>
Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-06-07 16:03:36 UTC (rev 1801)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-06-07 16:04:57 UTC (rev 1802)
@@ -432,6 +432,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)
@@ -1233,6 +1235,7 @@
raise TypeError, "%s() did not get expected keyword argument %s" % (self.__class__.__name__, column.name)
# Otherwise we put it in as though they did pass
# that keyword:
+
kw[column.name] = default
self.set(**kw)
Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py 2006-06-07 16:03:36 UTC (rev 1801)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py 2006-06-07 16:04:57 UTC (rev 1802)
@@ -147,7 +147,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))
|
