Fix building where clause with filter expressions which may contain OR (#34)

Author: rsrg-zwiama

src/dataset_features_provider.py

@@ -143,7 +143,7 @@ def index(self, bbox, client_srid, filterexpr, filter_geom):
 
         where_clause = ""
         if where_clauses:
-            where_clause = "WHERE " + " AND ".join(where_clauses)
+            where_clause = "WHERE (" + ") AND (".join(where_clauses) + ")"
 
         geom_sql = self.geom_column_sql(srid, with_bbox=False)
         if self.geometry_column:
@@ -229,7 +229,7 @@ def extent(self, client_srid, filterexpr, filter_geom):
 
         where_clause = ""
         if where_clauses:
-            where_clause = "WHERE " + " AND ".join(where_clauses)
+            where_clause = "WHERE (" + ") AND (".join(where_clauses) + ")"
 
         if not self.geometry_column:
             return None
@@ -311,7 +311,7 @@ def show(self, id, client_srid):
 
         add_where_clause = ""
         if self.datasource_filter:
-            add_where_clause = "AND " + self.datasource_filter
+            add_where_clause = "AND (" + self.datasource_filter + ")"
 
         geom_sql = self.geom_column_sql(srid)
         sql = sql_text(("""
@@ -438,7 +438,7 @@ def destroy(self, id):
 
         add_where_clause = ""
         if self.datasource_filter:
-            add_where_clause = "AND " + self.datasource_filter
+            add_where_clause = "AND (" + self.datasource_filter + ")"
 
         # build query SQL
         sql = sql_text("""
@@ -469,7 +469,7 @@ def exists(self, id):
 
         add_where_clause = ""
         if self.datasource_filter:
-            add_where_clause = "AND " + self.datasource_filter
+            add_where_clause = "AND (" + self.datasource_filter + ")"
 
         sql = sql_text(("""
             SELECT EXISTS(SELECT 1 FROM {table} WHERE {pkey}=:id {add_where_clause})
@@ -1245,7 +1245,7 @@ def __query_join_attributes(self, join_attributes, own_attribute_values):
             datasource_filter = jointableconfig.get('datasource_filter', None)
             add_where_clause = ""
             if datasource_filter:
-                add_where_clause = "AND " + datasource_filter
+                add_where_clause = "AND (" + datasource_filter + ")"
 
             sql = sql_text(("""
                 SELECT {columns}