[SQL-CVS] r1208 - home/phd/SQLObject/paramstyles/sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2005-11-03 17:16:53
|
Author: phd
Date: 2005-11-03 17:16:47 +0000 (Thu, 03 Nov 2005)
New Revision: 1208
Modified:
home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
Log:
Renamed SQLQuery to SQLList; implemented __sqlrepr__().
Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2005-11-03 16:33:27 UTC (rev 1207)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2005-11-03 17:16:47 UTC (rev 1208)
@@ -300,7 +300,7 @@
if self.debug:
self.printDebug(conn, query, 'QueryR')
return cursor.execute(query)
- elif isinstance(query, sqlbuilder.SQLQuery):
+ elif isinstance(query, sqlbuilder.SQLList):
query_string, params = self._convertQuery(query)
if self.debug:
self.printDebug(conn, query_string, 'QueryString')
@@ -362,7 +362,7 @@
def _insertSQL(self, table, names, values):
name_value_dict = dict(zip(names, values))
- return sqlbuilder.SQLQuery(DBSingleStyle.insert(table, name_value_dict))
+ return sqlbuilder.SQLList(DBSingleStyle.insert(table, name_value_dict))
def transaction(self):
return Transaction(self)
Modified: home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py 2005-11-03 16:33:27 UTC (rev 1207)
+++ home/phd/SQLObject/paramstyles/sqlobject/sqlbuilder.py 2005-11-03 17:16:47 UTC (rev 1208)
@@ -431,13 +431,17 @@
########################################
-## SQL Queries
+## SQL Query lists
########################################
-class SQLQuery(object):
+class SQLList(object):
def __init__(self, query_list):
self.query_list = query_list
+ def __sqlrepr__(self, db):
+ query_list = [sqlrepr(part, db) for part in self.query_list]
+ return ''.join(query_list)
+
########################################
## SQL Statements
########################################
|