Rename script_type

anti-social · Nov 18, 2020 · b5dffd4 · b5dffd4
1 parent 5adb833
commit b5dffd4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/elasticmagic/compiler.py b/elasticmagic/compiler.py
@@ -413,8 +413,8 @@ def visit_sort(self, expr):
 
     def visit_sort_script(self, sort_script):
         res = dict(script=dict())
-        if sort_script.type_sort:
-            res['type'] = sort_script.type_sort
+        if sort_script.script_type:
+            res['type'] = sort_script.script_type
         if sort_script.order:
             res['order'] = sort_script.order
         if sort_script.script:

diff --git a/elasticmagic/expression.py b/elasticmagic/expression.py
@@ -482,10 +482,10 @@ def _collect_doc_classes(self):
 class SortScript(Expression):
     __visit_name__ = 'sort_script'
 
-    def __init__(self, script, type_sort=None, order=None):
+    def __init__(self, script, script_type=None, order=None):
         self.script = script
         self.order = order
-        self.type_sort = type_sort
+        self.script_type = script_type
 
 
 class FieldOperators(object):

diff --git a/tests/test_expression.py b/tests/test_expression.py
@@ -522,7 +522,7 @@ def test_expression(self):
         self.assert_expression(
             SortScript(
                 script=Script(inline='score * 2', params={'a': 1}),
-                type_sort='number'
+                script_type='number'
             ),
             {
                 '_script': {
@@ -541,7 +541,7 @@ def test_expression(self):
                 script=Script(
                     inline='score * 2', params={'a': 1}, lang='painless'
                 ),
-                type_sort='number',
+                script_type='number',
                 order='asc',
             ),
             {

diff --git a/tests/test_search.py b/tests/test_search.py
@@ -718,7 +718,7 @@ def test_aggregations(self):
                                 inline='score * params.a'
                             ),
                             order='asc',
-                            type_sort='number',
+                            script_type='number',
                         )
 
                     )