Thread: [SQL-CVS] r1883 - in SQLObject/trunk/sqlobject: . tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2006-08-24 15:37:58
|
Author: phd Date: 2006-08-24 09:37:53 -0600 (Thu, 24 Aug 2006) New Revision: 1883 Modified: SQLObject/trunk/sqlobject/sqlbuilder.py SQLObject/trunk/sqlobject/tests/test_aliases.py Log: In the course of fixing the bug 1516394: SQLbuilder aliases fail for Firebird I found most database (I tested MySQL, PostgreSQL and SQLite) ignore that noisy "AS" so I just removed it from the queries. Modified: SQLObject/trunk/sqlobject/sqlbuilder.py =================================================================== --- SQLObject/trunk/sqlobject/sqlbuilder.py 2006-08-24 14:38:27 UTC (rev 1882) +++ SQLObject/trunk/sqlobject/sqlbuilder.py 2006-08-24 15:37:53 UTC (rev 1883) @@ -382,6 +382,8 @@ ######################################## class AliasField(Field): + as_string = '' # set it to "AS" if your database requires it + def __init__(self, tableName, fieldName, alias): Field.__init__(self, tableName, fieldName) self.alias = alias @@ -390,7 +392,7 @@ return self.alias + "." + self.fieldName def tablesUsedImmediate(self): - return ["%s AS %s" % (self.tableName, self.alias)] + return ["%s %s %s" % (self.tableName, self.as_string, self.alias)] class AliasTable(Table): FieldClass = AliasField Modified: SQLObject/trunk/sqlobject/tests/test_aliases.py =================================================================== --- SQLObject/trunk/sqlobject/tests/test_aliases.py 2006-08-24 14:38:27 UTC (rev 1882) +++ SQLObject/trunk/sqlobject/tests/test_aliases.py 2006-08-24 15:37:53 UTC (rev 1883) @@ -15,7 +15,7 @@ alias = Alias(JoinAlias) select = JoinAlias.select(JoinAlias.q.parent == alias.q.name) assert str(select) == \ - "SELECT join_alias.id, join_alias.name, join_alias.parent FROM join_alias AS join_alias_alias1, join_alias WHERE ((join_alias.parent) = (join_alias_alias1.name))" + "SELECT join_alias.id, join_alias.name, join_alias.parent FROM join_alias join_alias_alias1, join_alias WHERE ((join_alias.parent) = (join_alias_alias1.name))" def test_2perform_join(): setupClass(JoinAlias) |