Browse Source

Added a test to detect empty relational filter arguments in the parsing process

Roland Haroutiounian 9 years ago
parent
commit
936219e47a
1 changed files with 14 additions and 12 deletions
  1. 14
    12
      leobject/datasources/ledatasourcesql.py

+ 14
- 12
leobject/datasources/ledatasourcesql.py View File

@@ -115,10 +115,11 @@ class LeDataSourceSQL(DummyDatasource):
115 115
     # @return dict : Dictionnary with (FIELD, OPERATOR):VALUE style elements
116 116
     def _prepare_filters(self, filters):
117 117
         prepared_filters = {}
118
-        for filter_item in filters:
119
-            prepared_filter_key = (filter_item[0], filter_item[1])
120
-            prepared_filter_value = filter_item[2]
121
-            prepared_filters[prepared_filter_key] = prepared_filter_value
118
+        if filters is not None and len(filters)>0:
119
+            for filter_item in filters:
120
+                prepared_filter_key = (filter_item[0], filter_item[1])
121
+                prepared_filter_value = filter_item[2]
122
+                prepared_filters[prepared_filter_key] = prepared_filter_value
122 123
 
123 124
         return prepared_filters
124 125
 
@@ -128,13 +129,14 @@ class LeDataSourceSQL(DummyDatasource):
128 129
     def _prepare_rel_filters(self, rel_filters):
129 130
         prepared_rel_filters = []
130 131
 
131
-        for rel_filter in rel_filters:
132
-            rel_filter_dict = {
133
-                'position': REL_SUB if rel_filter[0][0] == REL_SUP else REL_SUB,
134
-                'nature': rel_filter[0][1],
135
-                'condition_key': (self.RELATIONS_POSITIONS_FIELDS[rel_filter[0][0]], rel_filter[1]),
136
-                'condition_value': rel_filter[2]
137
-            }
138
-            prepared_rel_filters.append(rel_filter_dict)
132
+        if rel_filters is not None and len(rel_filters)>0:
133
+            for rel_filter in rel_filters:
134
+                rel_filter_dict = {
135
+                    'position': REL_SUB if rel_filter[0][0] == REL_SUP else REL_SUB,
136
+                    'nature': rel_filter[0][1],
137
+                    'condition_key': (self.RELATIONS_POSITIONS_FIELDS[rel_filter[0][0]], rel_filter[1]),
138
+                    'condition_value': rel_filter[2]
139
+                }
140
+                prepared_rel_filters.append(rel_filter_dict)
139 141
 
140 142
         return prepared_rel_filters

Loading…
Cancel
Save