Add a special case for SearchableText: when there are mustiple MATCH...

Add a special case for SearchableText: when there are mustiple MATCH subqueries, sum up all scores. This used to fail and should be the most sensible default behaviour.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25971 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SQLExpression.py

@@ -299,6 +299,10 @@ class SQLExpression(object):
       for alias, column in sql_expression.getSelectDict().iteritems():
         existing_value = result.get(alias)
         if existing_value not in (None, column):
+          if alias == 'SearchableText':
+            # Custom conflict resolution
+            column = '%s + %s' % (existing_value, column)
+          else:
             message = '%r is a known alias for column %r, can\'t alias it now to column %r' % (alias, existing_value, column)
             if DEBUG:
               message = message + '. I was created by %r, and I am working on %r (%r) out of [%s]' % (