Merge pull request #17 from JavaScriptor/fix-as-for-identifier

fix: current alias for identifier in stringify process.

Author: albin3

.travis.yml

@@ -12,5 +12,5 @@ node_js:
   - "v8.11.3"
   - "v10.7.0"
 scripts: {
-  "test": "make test"
+  "test": "npm run test:build"
   }

package.json

@@ -5,11 +5,12 @@
   "main": "./dist/parser/sqlParser.js",
   "scripts": {
     "build": "jison -m js ./src/sqlParser.jison -o ./dist/parser/sqlParser.js && npm run build-concat",
-    "build-concat": "concat -o ./dist/parser/sqlParser.js ./dist/parser/sqlParser.js src/stringify.js src/suffix.js",
+    "build-concat": "cat src/stringify.js src/suffix.js >> ./dist/parser/sqlParser.js",
     "postbuild": "npm run test:build",
+    "test": "npm run build",
     "test:all": "mocha --require babel-register",
-    "test:build": "mocha 'test/*.test.js'",
-    "test:benchmark": "mocha test/benchmark.js"
+    "test:build": "mocha --require babel-register 'test/*.test.js'",
+    "test:benchmark": "mocha --require babel-register test/benchmark.js"
   },
   "repository": {
     "type": "git",

src/stringify.js

@@ -130,11 +130,11 @@ Sql.prototype.travelSelectExpr = function (ast) {
       this.append(exprList[i]);
     } else {
       this.travel(exprList[i]);
-      if (ast.alias) {
-        if (ast.hasAs) {
+      if (exprList[i].alias) {
+        if (exprList[i].hasAs) {
           this.appendKeyword('as');
         }
-        this.travel(ast.alias);
+        this.travel(exprList[i].alias);
       }
     }
     if (i !== exprList.length - 1) {
@@ -184,12 +184,6 @@ Sql.prototype.travelFunctionCall = function (ast) {
     }
   }
   this.append(')', true);
-  if (ast.alias) {
-    if (ast.hasAs) {
-      this.appendKeyword('as');
-    }
-    this.travel(ast.alias);
-  }
 }
 Sql.prototype.travelFunctionCallParam = function (ast) {
   if (ast.distinctOpt) {
@@ -249,12 +243,6 @@ Sql.prototype.travelSubQuery = function (ast) {
   this.append('(', false, true);
   this.travel(ast.value);
   this.append(')', true);
-  if (ast.alias) {
-    if (ast.hasAs) {
-      this.appendKeyword('as');
-    }
-    this.travel(ast.alias);
-  }
 }
 Sql.prototype.travelIdentifierExpr = function (ast) {
   this.append('{');

test/main.test.js

@@ -357,7 +357,7 @@ describe('select grammar support', function () {
   });
 
   it ('recognoce alias for sql-function calls in stringify function.', function () {
-    testParser('SELECT COUNT(*) AS total FROM b');
+    testParser('SELECT COUNT(*) AS total, a b, b as c, c/2 d, d & e an FROM b');
   });
 
 });