[Erp5-report] r26451 - in /erp5/trunk/products/ZSQLCatalog: SearchText/ tests/

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Apr 15 17:06:41 2009
New Revision: 26451

URL: http://svn.erp5.org?rev=26451&view=rev
Log:
Change implicit SearchText expression logical operator to 'and' instead of 'or'.
Update test to new desired behaviour.

Modified:
    erp5/trunk/products/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py
    erp5/trunk/products/ZSQLCatalog/tests/testSQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py?rev=26451&r1=26450&r2=26451&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SearchText/AdvancedSearchTextParser.py [utf8] Wed Apr 15 17:06:41 2009
@@ -155,7 +155,7 @@
     if len(p) == 2:
       p[0] = p[1]
     elif len(p) == 3:
-      p[0] = p[1].push('or', p[2])
+      p[0] = p[1].push('and', p[2])
     else:
       p[0] = p[1].push('or', p[3])
 

Modified: erp5/trunk/products/ZSQLCatalog/tests/testSQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/tests/testSQLCatalog.py?rev=26451&r1=26450&r2=26451&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/tests/testSQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/tests/testSQLCatalog.py [utf8] Wed Apr 15 17:06:41 2009
@@ -174,11 +174,11 @@
                  {column: '!=a'})
     self.catalog(ReferenceQuery(ReferenceQuery(operator='=', default='a b'), operator='and'),
                  {column: 'a b'})
-    self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='=', default='a'), ReferenceQuery(operator='>', default='b'), operator='or'), operator='and'),
+    self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='=', default='a'), ReferenceQuery(operator='>', default='b'), operator='and'), operator='and'),
                  {column: 'a >b'})
     self.catalog(ReferenceQuery(ReferenceQuery(operator='=', default='a > b'), operator='and'),
                  {column: 'a > b'})
-    self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='>', default='a'), ReferenceQuery(operator='>', default='b'), operator='or'), operator='and'),
+    self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='>', default='a'), ReferenceQuery(operator='>', default='b'), operator='and'), operator='and'),
                  {column: '>a >b'})
     self.catalog(ReferenceQuery(ReferenceQuery(operator='=', default='>a >b'), operator='and'),
                  {column: '">a >b"'})
@@ -353,8 +353,11 @@
     self.catalog(ReferenceQuery(ReferenceQuery(operator='like', keyword='%"a" OR "b"%'), operator='and'),
                  {'keyword': '"\\"a\\" OR \\"b\\""'})
     self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='match', fulltext='a'),
+                                               ReferenceQuery(ReferenceQuery(operator='match', fulltext='b'), operator='not'), operator='and'), operator='and'),
+                 {'fulltext': 'a NOT b'})
+    self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='match', fulltext='a'),
                                                ReferenceQuery(ReferenceQuery(operator='match', fulltext='b'), operator='not'), operator='or'), operator='and'),
-                 {'fulltext': 'a NOT b'})
+                 {'fulltext': 'a OR NOT b'})
     self.catalog(ReferenceQuery(ReferenceQuery(ReferenceQuery(operator='match', fulltext='a'),
                                                ReferenceQuery(ReferenceQuery(operator='match', fulltext='b'), operator='not'), operator='and'), operator='and'),
                  {'fulltext': 'a AND NOT b'})