[SQL-CVS] r4460 - SQLObject/trunk/sqlobject/tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2011-09-29 16:11:24
|
Author: phd
Date: Thu Sep 29 10:11:13 2011
New Revision: 4460
Log:
tableName conflicts with SQLObjectTable.tableName (via SQLObject.q.tableName).
Modified:
SQLObject/trunk/sqlobject/tests/dbtest.py
Modified: SQLObject/trunk/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/dbtest.py Thu Sep 29 09:06:55 2011 (r4459)
+++ SQLObject/trunk/sqlobject/tests/dbtest.py Thu Sep 29 10:11:13 2011 (r4460)
@@ -120,7 +120,7 @@
"""
_connection = installedDBTracker
- tableName = sqlobject.StringCol(notNull=True)
+ table_name = sqlobject.StringCol(notNull=True)
createSQL = sqlobject.StringCol(notNull=True)
connectionURI = sqlobject.StringCol(notNull=True)
@@ -140,7 +140,7 @@
if not soClass._connection.tableExists(table):
continue
items = list(cls.selectBy(
- tableName=table,
+ table_name=table,
connectionURI=soClass._connection.uri()))
if items:
instance = items[0]
@@ -178,7 +178,7 @@
sql, extra_sql = soClass.createTableSQL()
soClass.createTable(applyConstraints=False)
all_extra.extend(extra_sql)
- cls(tableName=soClass.sqlmeta.table,
+ cls(table_name=soClass.sqlmeta.table,
createSQL=sql,
connectionURI=soClass._connection.uri())
for extra_sql in all_extra:
|