unified behavior of RANGE function

jsteemann · jsteemann · commit 7800085a9b58 · 2016-01-25T14:19:49.000+01:00
diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp
@@ -4452,7 +4452,17 @@ AqlValue Functions::Range(arangodb::aql::Query* query,
   double step = 0.0;
   if (n == 3) {
     auto const stepJson = ExtractFunctionParameter(trx, parameters, 2, false);
-    step = ValueToNumber(stepJson.json(), unused);
+    if (!TRI_IsNullJson(stepJson.json())) {
+      step = ValueToNumber(stepJson.json(), unused);
+    }
+    else {
+      // no step specified
+      if (from <= to) {
+        step = 1.0;
+      } else {
+        step = -1.0;
+      }
+    }
   } else {
     // no step specified
     if (from <= to) {
diff --git a/js/server/modules/@arangodb/aql.js b/js/server/modules/@arangodb/aql.js
@@ -2953,10 +2953,10 @@ function AQL_REVERSE (value) {
 function AQL_RANGE (from, to, step) {
   'use strict';
 
-  from = AQL_TO_NUMBER(from);
-  to = AQL_TO_NUMBER(to);
+  from = AQL_TO_NUMBER(from) || 0;
+  to = AQL_TO_NUMBER(to) || 0;
   
-  if (step === undefined) {
+  if (step === undefined || step === null) {
     if (from <= to) {
       step = 1;
     }
@@ -2968,7 +2968,7 @@ function AQL_RANGE (from, to, step) {
   step = AQL_TO_NUMBER(step);
 
   // check if we would run into an endless loop
-  if (step === 0) {
+  if (step === 0 || step === null) {
     WARN("RANGE", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
     return null;
   }
