[Erp5-report] r11869 - in /erp5/trunk/products/CMFCategory: Category.py Filter.py

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Jan 3 11:08:10 CET 2007


Author: jp
Date: Wed Jan  3 11:08:08 2007
New Revision: 11869

URL: http://svn.erp5.org?rev=11869&view=rev
Log:
Naming convention: SQL should be in big caps.

Modified:
    erp5/trunk/products/CMFCategory/Category.py
    erp5/trunk/products/CMFCategory/Filter.py

Modified: erp5/trunk/products/CMFCategory/Category.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/Category.py?rev=11869&r1=11868&r2=11869&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/Category.py (original)
+++ erp5/trunk/products/CMFCategory/Category.py Wed Jan  3 11:08:08 2007
@@ -414,15 +414,15 @@
       """
       return context.isMemberOf(self.getCategoryName())
 
-    security.declareProtected( Permissions.AccessContentsInformation, 'asSqlExpression' )
-    def asSqlExpression(self, strict_membership=0, table='category', base_category = None):
+    security.declareProtected( Permissions.AccessContentsInformation, 'asSQLExpression' )
+    def asSQLExpression(self, strict_membership=0, table='category', base_category = None):
       """
         A Predicate can be rendered as an sql expression. This
         can be useful to create reporting trees based on the
         ZSQLCatalog
       """
-      #LOG('Category.asSqlExpression self', 0, str(self))
-      #LOG('asSqlExpression parent', 0, str(self.aq_parent))
+      #LOG('Category.asSQLExpression self', 0, str(self))
+      #LOG('asSQLExpression parent', 0, str(self.aq_parent))
       if base_category is None:
         base_category = self
       elif type(base_category) is type('a'):
@@ -437,7 +437,7 @@
             (table, self.getUid(), table, base_category.getBaseCategoryUid())
       # Now useless since we precompute the mapping
       #for o in self.objectValues():
-      #  sql_text += ' OR %s' % o.asSqlExpression()
+      #  sql_text += ' OR %s' % o.asSQLExpression()
       return sql_text
 
     # A Category's categories is self
@@ -553,7 +553,7 @@
     security = ClassSecurityInfo()
     security.declareObjectProtected(Permissions.AccessContentsInformation)
 
-    def asSqlExpression(self, strict_membership=0, table='category', base_category=None):
+    def asSQLExpression(self, strict_membership=0, table='category', base_category=None):
       """
         A Predicate can be rendered as an sql expression. This
         can be useful to create reporting trees based on the
@@ -568,7 +568,7 @@
                                (table, self.uid, table, self.uid)
       # Now useless since we precompute the mapping
       #for o in self.objectValues():
-      #  sql_text += ' OR %s' % o.asSqlExpression()
+      #  sql_text += ' OR %s' % o.asSQLExpression()
       return sql_text
 
     security.declareProtected(Permissions.AccessContentsInformation, 

Modified: erp5/trunk/products/CMFCategory/Filter.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/Filter.py?rev=11869&r1=11868&r2=11869&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/Filter.py (original)
+++ erp5/trunk/products/CMFCategory/Filter.py Wed Jan  3 11:08:08 2007
@@ -84,7 +84,7 @@
     """
     return self.filter_dict
 
-  def asSql(self):
+  def asSQL(self):
     """
       Returns an SQL expression which can be used as a query
     """




More information about the Erp5-report mailing list