[SQL-CVS] r3264 - in SQLObject/trunk: docs sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2008-02-27 13:44:04
|
Author: phd Date: 2008-02-27 06:43:58 -0700 (Wed, 27 Feb 2008) New Revision: 3264 Modified: SQLObject/trunk/docs/Authors.txt SQLObject/trunk/docs/News.txt SQLObject/trunk/sqlobject/main.py Log: Merged revisions 3060:3062 from the 0.9 branch - patches by Diez B. Roggisch <deets at web.de>: Prevent MultipleJoin from removing the intermediate table if it was not created by the Join. Modified: SQLObject/trunk/docs/Authors.txt =================================================================== --- SQLObject/trunk/docs/Authors.txt 2008-02-27 13:43:15 UTC (rev 3263) +++ SQLObject/trunk/docs/Authors.txt 2008-02-27 13:43:58 UTC (rev 3264) @@ -1,8 +1,7 @@ Authors ======= -SQLObject was originally written and continues to be maintained by Ian -Bicking <ia...@co...> +SQLObject was originally written by Ian Bicking <ia...@co...>. Contributions have been made by: @@ -21,6 +20,7 @@ * Shahms King <shahms at shahms.com> * David Turner, The Open Planning Project * Dan Pascu <dan at ag-projects.com> +* Diez B. Roggisch <deets at web.de> * Oleg Broytmann <ph...@ph...> .. image:: http://sourceforge.net/sflogo.php?group_id=74338&type=4 Modified: SQLObject/trunk/docs/News.txt =================================================================== --- SQLObject/trunk/docs/News.txt 2008-02-27 13:43:15 UTC (rev 3263) +++ SQLObject/trunk/docs/News.txt 2008-02-27 13:43:58 UTC (rev 3264) @@ -72,6 +72,12 @@ * MySQLConnection (and DB URI) accept a number of SSL-related parameters: ssl_key, ssl_cert, ssl_ca, ssl_capath. +SQLObject 0.9.4 +=============== + +* Prevent MultipleJoin from removing the intermediate table if it was not + created by the Join. + SQLObject 0.9.3 =============== Modified: SQLObject/trunk/sqlobject/main.py =================================================================== --- SQLObject/trunk/sqlobject/main.py 2008-02-27 13:43:15 UTC (rev 3263) +++ SQLObject/trunk/sqlobject/main.py 2008-02-27 13:43:58 UTC (rev 3264) @@ -1386,9 +1386,6 @@ def createJoinTables(cls, ifNotExists=False, connection=None): conn = connection or cls._connection for join in cls._getJoinsToCreate(): - if not getattr(join, 'createRelatedTable', True): - # This join has requested not to be created - continue if (ifNotExists and conn.tableExists(join.intermediateTable)): continue @@ -1399,9 +1396,6 @@ conn = connection or cls._connection sql = [] for join in cls._getJoinsToCreate(): - if not getattr(join, 'createRelatedTable', True): - # This join has requested not to be created - continue sql.append(conn._SO_createJoinTableSQL(join)) return ';\n'.join(sql) createJoinTablesSQL = classmethod(createJoinTablesSQL) @@ -1429,7 +1423,7 @@ for join in cls.sqlmeta.joins: if not join: continue - if not join.hasIntermediateTable(): + if not join.hasIntermediateTable() or not getattr(join, 'createRelatedTable', True): continue if join.soClass.__name__ > join.otherClass.__name__: continue @@ -1442,7 +1436,7 @@ for join in cls.sqlmeta.joins: if not join: continue - if not join.hasIntermediateTable(): + if not join.hasIntermediateTable() or not getattr(join, 'createRelatedTable', True): continue if join.soClass.__name__ > join.otherClass.__name__: continue |