[SQL-CVS] r1774 - SQLObject/trunk/sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2006-05-18 16:51:44
|
Author: phd Date: 2006-05-18 10:51:33 -0600 (Thu, 18 May 2006) New Revision: 1774 Modified: SQLObject/trunk/sqlobject/main.py Log: Applied the fix from http://trac.turbogears.org/turbogears/ticket/738 for the bug https://sourceforge.net/tracker/index.php?func=detail&aid=1421647&group_id=74338&atid=540672 Modified: SQLObject/trunk/sqlobject/main.py =================================================================== --- SQLObject/trunk/sqlobject/main.py 2006-05-17 20:51:57 UTC (rev 1773) +++ SQLObject/trunk/sqlobject/main.py 2006-05-18 16:51:33 UTC (rev 1774) @@ -1383,9 +1383,13 @@ conn = connection or cls._connection sql, constraints = conn.createTableSQL(cls) if createJoinTables: - sql += '\n' + cls.createJoinTablesSQL(connection=conn) + join_sql = cls.createJoinTablesSQL(connection=conn) + if join_sql: + sql = ';\n' + join_sql if createIndexes: - sql += '\n' + cls.createIndexesSQL(connection=conn) + index_sql = cls.createIndexesSQL(connection=conn) + if index_sql: + sql += ';\n' + index_sql return sql, constraints createTableSQL = classmethod(createTableSQL) |