Commit 7dce4c9b authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Eteri

DomainTool: Unite inner-join and left-join predicate lookups

Improvement: As proposed by Jean-Paul when this extension was added (2010),
allows mixing left- and inner-join lookups.
Improvement: Now it is not required to specify tested_base_category_list
to enable inner joins: they will automatically be used whenever a base
category set on context matches the preference. If all categories set on
context match the preference, then no left join will be used at all.
parent be35a7ff
...@@ -33,7 +33,7 @@ from Products.ERP5Type.Globals import InitializeClass, DTMLFile ...@@ -33,7 +33,7 @@ from Products.ERP5Type.Globals import InitializeClass, DTMLFile
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from Products.ERP5 import _dtmldir from Products.ERP5 import _dtmldir
from Products.ERP5Type.Tool.BaseTool import BaseTool from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ZSQLCatalog.SQLCatalog import SQLQuery, Query, SimpleQuery, ComplexQuery from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, ComplexQuery
from zLOG import LOG from zLOG import LOG
from DateTime import DateTime from DateTime import DateTime
...@@ -156,58 +156,62 @@ class DomainTool(BaseTool): ...@@ -156,58 +156,62 @@ class DomainTool(BaseTool):
for tested_base_category in tested_base_category_list: for tested_base_category in tested_base_category_list:
if portal_categories.get(tested_base_category) is None: if portal_categories.get(tested_base_category) is None:
raise ValueError('Unknown base category: %r' % (tested_base_category, )) raise ValueError('Unknown base category: %r' % (tested_base_category, ))
extend(getter(tested_base_category, base=1)) tested_category_list = getter(tested_base_category, base=1)
preferred_predicate_category_list = portal.portal_preferences.getPreferredPredicateCategoryList() if tested_category_list:
extend(tested_category_list)
if (preferred_predicate_category_list and else:
tested_base_category_list is not None and # Developer requested specific base categories, but context do not
set(preferred_predicate_category_list).issuperset(tested_base_category_list)): # declare one of these. Skipping this criterion risks matching too
# New behavior is enabled only if preferred predicate category is # many predicates, breaking the system performance-wise. So let
# defined and tested_base_category_list is passed. # developer know there is an unexpected situation by raising.
predicate_category_query_list = [] raise ValueError('%r does not have any %r relation' % (
predicate_category_table_name_list = [] context.getPath(),
category_dict = {} tested_base_category,
for relative_url in category_list: ))
category_value = portal_categories.getCategoryValue(relative_url) left_join_list = kw.get('left_join_list', [])[:]
base_category_id = portal_categories.getBaseCategoryId(relative_url) inner_join_list = kw.get('inner_join_list', [])[:]
base_category_value = portal_categories.getCategoryValue(base_category_id) if category_list:
if not base_category_value in category_dict: preferred_predicate_category_list = portal.portal_preferences.getPreferredPredicateCategoryList([])
category_dict[base_category_value] = [] left_join_category_list = []
category_dict[base_category_value].append(category_value) inner_join_category_list = []
for category in category_list:
for base_category_value, category_value_list in category_dict.iteritems(): if portal_categories.getBaseCategoryId(category) in preferred_predicate_category_list:
if base_category_value.getId() in preferred_predicate_category_list: inner_join_category_list.append(category)
table_index = len(predicate_category_query_list) else:
predicate_category_table_name = 'predicate_category_for_domain_tool_%s' % table_index left_join_category_list.append(category)
table_alias_list = [('predicate_category', predicate_category_table_name)] def onMissing(category):
predicate_category_query_list.append( # BBB: ValueError would seem more appropriate here, but original code
ComplexQuery( # was raising TypeError - and this is explicitely tested for.
Query(predicate_category_base_category_uid=base_category_value.getUid(), table_alias_list=table_alias_list), raise TypeError('Unknown category: %r' % (category, ))
Query(predicate_category_category_strict_membership=1, table_alias_list=table_alias_list), for join_category_list, join_list, predicate_has_no_condition_value in (
ComplexQuery( # Base category is part of preferred predicate categories, predicates
Query(predicate_category_category_uid=[category_value.getUid() for category_value in category_value_list], table_alias_list=table_alias_list), # which ignore it are indexed with category_uid=0.
Query(predicate_category_category_uid='NULL', table_alias_list=table_alias_list), (inner_join_category_list, inner_join_list, 0),
logical_operator='OR'), # Base category is not part of preferred predicate categories,
logical_operator='AND')) # predicates which ignore it get no predicate_category row inserted
# for it, so an SQL NULL appears, translating to None.
if not predicate_category_query_list: (left_join_category_list, left_join_list, None),
# Prevent matching everything ):
predicate_category_query_list.append(Query(predicate_category_base_category_uid=0)) category_parameter_kw = portal_catalog.getCategoryParameterDict(
join_category_list,
predicate_category_query = ComplexQuery( category_table='predicate_category',
logical_operator='AND', onMissing=onMissing,
*predicate_category_query_list) )
query_list.append(predicate_category_query) for relation, uid_set in category_parameter_kw.iteritems():
join_list.append(relation)
uid_set.add(predicate_has_no_condition_value)
kw.update(category_parameter_kw)
else: else:
# Traditional behavior # No category to match against, so predicates expecting any relation
category_expression_dict = portal_categories.buildAdvancedSQLSelector( # would not apply, so we can exclude these.
category_list or ['NULL'], # Note: this relies on a special indexation mechanism for predicate
query_table='predicate_category', # categories, which inserts a base_category_uid=0 line when indexed
none_sql_value=0, # predicate membership_criterion_category_list is empty.
) base_category_uid_column = 'predicate_category.base_category_uid'
kw['where_expression'] = SQLQuery(category_expression_dict['where_expression']) kw[base_category_uid_column] = 0
kw['from_expression'] = category_expression_dict['from_expression'] inner_join_list.append(base_category_uid_column)
kw['left_join_list'] = left_join_list
kw['inner_join_list'] = inner_join_list
if query_list: if query_list:
kw['query'] = ComplexQuery(logical_operator='AND', *query_list) kw['query'] = ComplexQuery(logical_operator='AND', *query_list)
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="SQL" module="Products.ZSQLMethods.SQL"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
query_table</string> </value>
</item>
<item>
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>z_related_predicate_category</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
<key>parent_relative_url | catalog/relative_url/z_related_parent</key> <key>parent_relative_url | catalog/relative_url/z_related_parent</key>
<key>parent_string_index | catalog/string_index/z_related_parent</key> <key>parent_string_index | catalog/string_index/z_related_parent</key>
<key>parent_title | catalog/title/z_related_parent</key> <key>parent_title | catalog/title/z_related_parent</key>
<key>predicate_category_base_category_uid | predicate_category/base_category_uid/z_related_predicate_category</key>
<key>predicate_category_category_strict_membership | predicate_category/category_strict_membership/z_related_predicate_category</key>
<key>predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category</key>
<key>predicate_uid | predicate/uid/z_related_predicate</key> <key>predicate_uid | predicate/uid/z_related_predicate</key>
<key>related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use</key> <key>related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use</key>
<key>resourceType | catalog/portal_type/z_related_resource_uid_from_stock</key> <key>resourceType | catalog/portal_type/z_related_resource_uid_from_stock</key>
......
...@@ -53,9 +53,6 @@ parent_portal_type | catalog/portal_type/z_related_parent ...@@ -53,9 +53,6 @@ parent_portal_type | catalog/portal_type/z_related_parent
translated_causality_state | translation/translated_message/z_related_translated_causality_state translated_causality_state | translation/translated_message/z_related_translated_causality_state
translated_causality_state_title | translation/translated_message/z_related_translated_causality_state_title translated_causality_state_title | translation/translated_message/z_related_translated_causality_state_title
metric_type_uid | measure/metric_type_uid/z_related_metric_type metric_type_uid | measure/metric_type_uid/z_related_metric_type
predicate_category_base_category_uid | predicate_category/base_category_uid/z_related_predicate_category
predicate_category_category_strict_membership | predicate_category/category_strict_membership/z_related_predicate_category
predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
child_aggregate_relative_url | catalog,category,catalog/relative_url/z_related_child_aggregate child_aggregate_relative_url | catalog,category,catalog/relative_url/z_related_child_aggregate
children_reference | catalog/reference/z_related_children children_reference | catalog/reference/z_related_children
related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use
......
...@@ -436,6 +436,8 @@ class TestDomainTool(TestPredicateMixIn): ...@@ -436,6 +436,8 @@ class TestDomainTool(TestPredicateMixIn):
self.tic() self.tic()
# resource is not in preferred predicate category list, so only inner join is used # resource is not in preferred predicate category list, so only inner join is used
assertUsesLeftJoinAndPredicateItemsMatchingOrderLineEqual(False, [supply1_line1], tested_base_category_list=['source_section', 'destination_section', 'price_currency', 'resource']) assertUsesLeftJoinAndPredicateItemsMatchingOrderLineEqual(False, [supply1_line1], tested_base_category_list=['source_section', 'destination_section', 'price_currency', 'resource'])
# we now cover all categories defined on order_line, so it uses inner-join only even if tested_base_category_list is not specified.
assertUsesLeftJoinAndPredicateItemsMatchingOrderLineEqual(False, [supply1_line1])
# unknown base category ids cause an exception, so typos are detected # unknown base category ids cause an exception, so typos are detected
self.assertRaises( self.assertRaises(
...@@ -445,6 +447,14 @@ class TestDomainTool(TestPredicateMixIn): ...@@ -445,6 +447,14 @@ class TestDomainTool(TestPredicateMixIn):
portal_type='Sale Supply Line', portal_type='Sale Supply Line',
tested_base_category_list=['BOOO'], tested_base_category_list=['BOOO'],
) )
# known Base Categories but for which context has no relation also raise.
self.assertRaises(
ValueError,
searchPredicateList,
context=order_line,
portal_type='Sale Supply Line',
tested_base_category_list=['colour'],
)
def test_searchPredicateInvalidCategories(self): def test_searchPredicateInvalidCategories(self):
predicate = self.portal.sale_supply_module.newContent( predicate = self.portal.sale_supply_module.newContent(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment