[Erp5-report] r11880 - in /erp5/trunk/products: ERP5/Document/ ERP5Form/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 3 17:50:50 CET 2007
Author: jerome
Date: Wed Jan 3 17:50:47 2007
New Revision: 11880
URL: http://svn.erp5.org?rev=11880&view=rev
Log:
more s/Sql/SQL/g
Modified:
erp5/trunk/products/ERP5/Document/Predicate.py
erp5/trunk/products/ERP5Form/Selection.py
Modified: erp5/trunk/products/ERP5/Document/Predicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Predicate.py?rev=11880&r1=11879&r2=11880&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Predicate.py (original)
+++ erp5/trunk/products/ERP5/Document/Predicate.py Wed Jan 3 17:50:47 2007
@@ -167,8 +167,8 @@
return result
security.declareProtected( Permissions.AccessContentsInformation,
- 'buildSqlQuery' )
- def buildSqlQuery(self, strict_membership=0, table='category',
+ 'buildSQLQuery' )
+ def buildSQLQuery(self, strict_membership=0, table='category',
join_table='catalog', join_column='uid'):
"""
A Predicate can be rendered as an SQL expression. This
@@ -193,7 +193,7 @@
if category_value is not None:
table_alias = "single_%s_%s" % (table, base_category)
from_table_dict[table_alias] = 'category'
- membership_dict[base_category].append(category_value.asSqlExpression(
+ membership_dict[base_category].append(category_value.asSQLExpression(
strict_membership=strict_membership,
table=table_alias,
base_category=base_category))
@@ -214,7 +214,7 @@
join_count += 1
table_alias = "multi_%s_%s" % (table, join_count)
from_table_dict[table_alias] = 'category'
- multimembership_dict[base_category].append(category_value.asSqlExpression(
+ multimembership_dict[base_category].append(category_value.asSQLExpression(
strict_membership=strict_membership,
table=table_alias,
base_category=base_category))
@@ -232,17 +232,17 @@
return { 'from_table_list' : from_table_dict.items(),
'where_expression' : sql_text }
- security.declareProtected( Permissions.AccessContentsInformation, 'asSqlExpression' )
- def asSqlExpression(self, strict_membership=0, table='category'):
- """
- """
- return self.buildSqlQuery(strict_membership=strict_membership, table=table)['where_expression']
-
- security.declareProtected( Permissions.AccessContentsInformation, 'asSqlJoinExpression' )
- def asSqlJoinExpression(self, strict_membership=0, table='category', join_table='catalog', join_column='uid'):
- """
- """
- table_list = self.buildSqlQuery(strict_membership=strict_membership, table=table)['from_table_list']
+ security.declareProtected( Permissions.AccessContentsInformation, 'asSQLExpression' )
+ def asSQLExpression(self, strict_membership=0, table='category'):
+ """
+ """
+ return self.buildSQLQuery(strict_membership=strict_membership, table=table)['where_expression']
+
+ security.declareProtected( Permissions.AccessContentsInformation, 'asSQLJoinExpression' )
+ def asSQLJoinExpression(self, strict_membership=0, table='category', join_table='catalog', join_column='uid'):
+ """
+ """
+ table_list = self.buildSQLQuery(strict_membership=strict_membership, table=table)['from_table_list']
sql_text_list = map(lambda (a,b): '%s AS %s' % (b,a), table_list)
return ' , '.join(sql_text_list)
Modified: erp5/trunk/products/ERP5Form/Selection.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Selection.py?rev=11880&r1=11879&r2=11880&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Selection.py (original)
+++ erp5/trunk/products/ERP5Form/Selection.py Wed Jan 3 17:50:47 2007
@@ -359,8 +359,8 @@
SQL expressions to feed the SQL method (or the catalog). This
is the recommended approach.
- <dtml-var "selection.domain.asSqlExpression(table_map=(('eip','movement'), ('group', 'catalog')))">
- <dtml-var "selection.domain.asSqlJoinExpression(table_map=(('eip','movement'), ('group', 'catalog')))">
+ <dtml-var "selection.domain.asSQLExpression(table_map=(('eip','movement'), ('group', 'catalog')))">
+ <dtml-var "selection.domain.asSQLJoinExpression(table_map=(('eip','movement'), ('group', 'catalog')))">
Example 3: (mixed)
@@ -368,7 +368,7 @@
code generation is invoked on it. This is better than the manual
approach.
- <dtml-var "selection.domain.eip.asSqlExpresion(table="resource_category")">
+ <dtml-var "selection.domain.eip.asSQLExpresion(table="resource_category")">
Current implementation is only suitable for categories.
It needs to be extended to support also predicates. The right approach
@@ -417,8 +417,8 @@
return obj
- security.declarePublic('asSqlExpression')
- def asSqlExpression(self, table_map=None, domain_id=None,
+ security.declarePublic('asSQLExpression')
+ def asSQLExpression(self, table_map=None, domain_id=None,
exclude_domain_id=None, strict_membership=0,
join_table="catalog", join_column="uid", base_category=None):
select_expression = []
@@ -432,13 +432,13 @@
strict_membership=strict_membership))
elif k is not None:
if getattr(aq_base(d), 'isPredicate', 0):
- select_expression.append(d.asSqlExpression(table='%s_category' % k,
+ select_expression.append(d.asSQLExpression(table='%s_category' % k,
strict_membership=strict_membership))
else:
# This is a category, we must join
select_expression.append('%s.%s = %s_category.uid' % \
(join_table, join_column, k))
- select_expression.append(d.asSqlExpression(table='%s_category' % k,
+ select_expression.append(d.asSQLExpression(table='%s_category' % k,
base_category=k,
strict_membership=strict_membership))
# XXX We should take into account k explicitely
@@ -447,11 +447,11 @@
result = "( %s )" % ' AND '.join(select_expression)
else:
result = ''
- #LOG('DomainSelection', 0, 'asSqlExpression returns %r' % (result,))
+ #LOG('DomainSelection', 0, 'asSQLExpression returns %r' % (result,))
return result
- security.declarePublic('asSqlJoinExpression')
- def asSqlJoinExpression(self, domain_id=None, exclude_domain_id=None):
+ security.declarePublic('asSQLJoinExpression')
+ def asSQLJoinExpression(self, domain_id=None, exclude_domain_id=None):
join_expression = []
#LOG('DomainSelection', 0, 'domain_id = %r, exclude_domain_id = %r, self.domain_dict = %r' % (domain_id, exclude_domain_id, self.domain_dict))
portal = self.getPortalObject()
@@ -462,12 +462,12 @@
pass
elif k is not None:
if getattr(aq_base(d), 'isPredicate', 0):
- join_expression.append(d.asSqlJoinExpression(table='%s_category' % k))
+ join_expression.append(d.asSQLJoinExpression(table='%s_category' % k))
else:
# This is a category, we must join
join_expression.append('category AS %s_category' % k)
result = "%s" % ' , '.join(join_expression)
- #LOG('DomainSelection', 0, 'asSqlJoinExpression returns %r' % (result,))
+ #LOG('DomainSelection', 0, 'asSQLJoinExpression returns %r' % (result,))
return result
security.declarePublic('asDomainDict')
More information about the Erp5-report
mailing list