[Erp5-report] r31381 vincent - /erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Dec 17 18:22:24 2009
New Revision: 31381

URL: http://svn.erp5.org?rev=31381&view=rev
Log:
Make AutoQuery._createWrappedQuery raise immediately if generated query is None, to ease debugging.
Add forgotten "operator" property to AutoQuery.__repr__ .

Modified:
    erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py

Modified: erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py?rev=31381&r1=31380&r2=31381&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/Query/AutoQuery.py [utf8] Thu Dec 17 18:22:24 2009
@@ -108,6 +108,8 @@
       query = sql_catalog.buildQuery(kw, operator=operator, ignore_empty_string=self.ignore_empty_string)
     if self.table_alias_list is not None:
       query.setTableAliasList(self.table_alias_list)
+    if query is None:
+      raise ValueError, '%r failed generating a query from its parameters.' % (self, )
     self.wrapped_query = query
 
   @profiler_decorator
@@ -136,7 +138,8 @@
 
   def __repr__(self):
     if self.wrapped_query is None:
-      result = '<%s(**%r) at %s>' % (self.__class__.__name__, self.kw, id(self))
+      result = '<%s(operator=%r, **%r) at %s>' % (self.__class__.__name__,
+        self.operator, self.kw, id(self))
     else:
       result = '<%s %r>' % (self.__class__.__name__, self.wrapped_query)
     return result