Merge pull request #909 from ZeitOnline/WCM-526-parens

WCM-526: Encapsulate raw sql query in parens, so adding more clauses works if it uses OR

core/docs/changelog/WCM-526.change

@@ -0,0 +1 @@
+WCM-526: Encapsulate raw sql query in parens, so adding more clauses works if it uses OR

core/src/zeit/content/cp/tests/test_automatic.py

@@ -1098,8 +1098,12 @@ def test_cms_content_iter_returns_filled_in_blocks(self):
         self.assertEqual('International', content[0].ressort)
 
     def test_clauses_extend_query(self):
+        self.area.sql_query = "type='article' OR ressort='International'"
+        self.area.sql_restrict_time = False
         IRenderedArea(self.area).values()
-        query = "...type='article' AND published=true..."
+        query = """
+...WHERE (type='article' OR ressort='International') AND published=true ORDER...
+"""
         self.assertEllipsis(query, self.connector.search_args[0])
 
     def test_query_order_default(self):

core/src/zeit/contentquery/query.py

@@ -76,7 +76,7 @@ def total_hits(self):
 
     @property
     def conditions(self):
-        return select(ConnectorModel).where(sql(self.context.sql_query))
+        return select(ConnectorModel).where(sql(f'({self.context.sql_query})'))
 
     @property
     def order(self):