Merge pull request #78 from tumb1er/escape_fields

fixes #76
rutube · Apr 12, 2016 · 633c750 · 633c750
2 parents 6ab746a + b299eb1
commit 633c750
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/alco/collector/collector.py b/alco/collector/collector.py
@@ -273,10 +273,10 @@ def load_index_columns(self):
     @staticmethod
     def process_js_columns(js, columns, included, seen):
         for key, value in list(js.items()):
-            if key in ('pk', 'id', 'ts', 'ms', 'seq'):
-                # reserved by Django and ALCO
-                js.pop(key)
-                continue
+            if key in ('pk', 'id', 'ts', 'ms', 'seq', 'model'):
+                # escape fields reserved by Django and ALCO
+                js['%s_x' % key] = js.pop(key)
+                key = '%s_x' % key
             # save seen columns set
             if key not in seen:
                 seen.add(key)

diff --git a/alco/grep/models.py b/alco/grep/models.py
@@ -68,8 +68,6 @@ class Meta:
     fields = {}
 
     for column in index.loggercolumn_set.all():
-        if column.name in ('pk', 'id'):
-            continue
         if column.indexed:
             fields[column.name] = create_sphinx_field(column.name)
         else: