Address various issues

deploy/build.properties

@@ -29,9 +29,9 @@ modules-prefix=/
 # turn these on if you are using the roxy unit tester
 # Note: to activate Unit Testing, you must have test-content-db and test-port defined
 #
-# test-content-db=${app-name}-content-test
-# test-modules-db=${app-name}-modules
-# test-port=8042
+test-content-db=${app-name}-content-test
+test-modules-db=${app-name}-modules
+test-port=1042
 #
 # The authentication method used for your test appserver
 # application-level, basic, digest, digestbasic

deploy/ml-config.xml

@@ -190,7 +190,7 @@
         <range-element-index xmlns="http://marklogic.com/xdmp/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
           <scalar-type>long</scalar-type>
           <namespace-uri />
-          <localname>age</localname>
+          <localname>age id</localname>
           <collation />
           <range-value-positions>false</range-value-positions>
           <invalid-values>ignore</invalid-values>

rest-api/ext/sql.xqy

@@ -6,7 +6,7 @@ declare default function namespace "http://marklogic.com/rest-api/resource/sql";
 import module namespace s = "http://marklogic.com/sql" at "/sql.xqy";
 
 (:
- : curl -X POST --anyauth -umlsqlhttp-user:mlsqlhttp-password "http://localhost:1040/v1/resources/sql" -H "Content-Type: application/txt" -d @test/rest-api/ext/select.txt
+ : curl -X POST --anyauth -umlsqlhttp-user:mlsqlhttp-password "http://localhost:1040/v1/resources/sql?rs:format=json" -H "Content-Type: application/txt" -d "select * from person"
  :)
 declare function post(
     $context as map:map,

src/ext/parser.sjs

@@ -2360,7 +2360,10 @@ module.exports = (function () {
         return util.textNode(r);
       },
       peg$c505 = function (n) {
-        return util.key(n);
+        /*
+         * Currently used only for aliases. Should not force to lower-case.
+         */
+        return util.textNode(n);
       },
       peg$c506 = "]",
       peg$c507 = {
@@ -3535,7 +3538,7 @@ module.exports = (function () {
     function peg$computeLocation(startPos, endPos) {
       var startPosDetails = peg$computePosDetails(startPos),
         endPosDetails = peg$computePosDetails(endPos);
-
+        
       return {
         start: {
           offset: startPos,
@@ -7944,7 +7947,15 @@ module.exports = (function () {
               }
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c175(s1, s3, s5);
+
+                if (s5 != null 
+                    && s5.hasOwnProperty("flip") 
+                    && s5.flip) {
+                  s1 = peg$c175(s1, s5, s3);
+                } else {
+                  s1 = peg$c175(s1, s3, s5);
+                }
+
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -7987,7 +7998,10 @@ module.exports = (function () {
         s2 = peg$parseexpression();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
+
+          var flip = (s1 === ",");
           s1 = peg$c177(s1, s2);
+          s1["flip"] = flip;
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -8004,7 +8018,7 @@ module.exports = (function () {
           peg$fail(peg$c176);
         }
       }
-
+      
       return s0;
     }
 
@@ -9058,7 +9072,7 @@ module.exports = (function () {
           peg$fail(peg$c211);
         }
       }
-
+      
       return s0;
     }
 
@@ -10086,7 +10100,7 @@ module.exports = (function () {
 
     function peg$parseinsert_values_list() {
       var s0, s1, s2, s3, s4;
-
+      
       s0 = peg$currPos;
       s1 = peg$parseinsert_values();
       if (s1 !== peg$FAILED) {