Merge branch 'master' into add-place-holder-support

Author: sockstack

CHANGELOG

@@ -8,3 +8,5 @@
 1.2.1 fix stringify having #29 , pr: #28
 1.2.2 feat: add support for "`" quoted alias, pr: #33
 1.3.0 fix tableFactor alias bug. AST changed in tableFactor. #34
+1.4.0 fix bug `using ' & " for column alias?` #40 #44
+1.4.1 hogfix "support quoted alias: multiple alias and orderby support"

README.md

@@ -10,6 +10,7 @@ sql grammar follows https://dev.mysql.com/doc/refman/5.7/en/select.html
 
 ## news
 
+- Fix bug `using ' & " for column alias?` since v1.4.1 [#40](https://github.com/JavaScriptor/js-sql-parser/issues/40), [#44](https://github.com/JavaScriptor/js-sql-parser/issues/44)
 - Fix bug tableFactor alias since v1.3.0 [#34](https://github.com/JavaScriptor/js-sql-parser/issues/34)
 - Add support for "`" quoted alias since v1.2.2. [#33](https://github.com/JavaScriptor/js-sql-parser/issues/33)
 - Fix bug stringify keyword `having` since v1.2.1. [#29](https://github.com/JavaScriptor/js-sql-parser/issues/29)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sql-parser",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "",
   "main": "./dist/parser/sqlParser.js",
   "scripts": {

src/sqlParser.jison

@@ -127,8 +127,9 @@ UNION                                                             return 'UNION'
 
 [a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*                  return 'IDENTIFIER'
 \.                                                                return 'DOT'
-['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["']          return 'QUOTED_IDENTIFIER'
-[`].+[`]                                                          return 'QUOTED_IDENTIFIER'
+["][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["]            return 'STRING'
+['][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[']            return 'STRING'
+([`])(?:(?=(\\?))\2.)*?\1                                         return 'IDENTIFIER'
 
 <<EOF>>                                                           return 'EOF'
 .                                                                 return 'INVALID'
@@ -281,13 +282,11 @@ selectExprAliasOpt
   : { $$ = {alias: null, hasAs: null} }
   | AS IDENTIFIER { $$ = {alias: $2, hasAs: true} }
   | IDENTIFIER { $$ = {alias: $1, hasAs: false} }
-  | AS QUOTED_IDENTIFIER { $$ = {alias: $2, hasAs: true} }
-  | QUOTED_IDENTIFIER { $$ = {alias: $1, hasAs: false} }
+  | AS STRING { $$ = {alias: $2, hasAs: true} }
+  | STRING { $$ = {alias: $2, hasAs: false} }
   ;
-
 string
-  : QUOTED_IDENTIFIER { $$ = { type: 'String', value: $1 } }
-  | STRING { $$ = { type: 'String', value: $1 } }
+  : STRING { $$ = { type: 'String', value: $1 } }
   ;
 number
   : NUMERIC { $$ = { type: 'Number', value: $1 } }

test/main.test.js

@@ -3,7 +3,7 @@
 const debug = require('debug')('js-sql-parser');
 const parser = require('../');
 
-const testParser = function(sql) {
+const testParser = function (sql) {
   let firstAst = parser.parse(sql);
   debug(JSON.stringify(firstAst, null, 2));
   let firstSql = parser.stringify(firstAst);
@@ -22,24 +22,24 @@ const testParser = function(sql) {
   return secondAst;
 };
 
-describe('select grammar support', function() {
-  it('test0', function() {
+describe('select grammar support', function () {
+  it('test0', function () {
     testParser('select a from b where c > 1 group by d order by e desc;');
   });
 
-  it('test1', function() {
+  it('test1', function () {
     testParser('select distinct max_statement_time = 1.2 a ');
   });
 
-  it('test2', function() {
+  it('test2', function () {
     testParser('select all 0x1f');
   });
 
-  it('test3', function() {
+  it('test3', function () {
     testParser('select distinctrow "xx", a in (1,2)');
   });
 
-  it('test4', function() {
+  it('test4', function () {
     testParser(`
       select
         tag_basic.gender as gender,
@@ -58,17 +58,17 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test5', function() {
+  it('test5', function () {
     testParser('select function(), function(1, "sd", 0x1F)');
   });
 
-  it('test6 unicode', function() {
+  it('test6 unicode', function () {
     testParser(`
       select in中文 from tags
     `);
   });
 
-  it('test7', function() {
+  it('test7', function () {
     testParser(`
       SELECT 
         DISTINCT high_priority MAX_STATEMENT_TIME=1 STRAIGHT_JOIN SQL_SMALL_RESULT SQL_BIG_RESULT SQL_BUFFER_RESULT SQL_CACHE SQL_CALC_FOUND_ROWS fm_customer.lname AS name1,
@@ -89,7 +89,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test8', function() {
+  it('test8', function () {
     testParser(`
       SELECT   P1.PAYMENTNO, P1.AMOUNT,
       (P1.AMOUNT * 100) / SUM(P2.AMOUNT)
@@ -99,7 +99,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test9', function() {
+  it('test9', function () {
     testParser(`
         SELECT  PLAYERS.PLAYERNO, NAME,
        (SELECT   COUNT(*)
@@ -114,7 +114,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test10', function() {
+  it('test10', function () {
     testParser(`
       SELECT rd.*, rd.rd_numberofrooms - (
         SELECT SUM(rn.reservation_numberofrooms) AS count_reserve_room
@@ -148,11 +148,11 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test11 SELECT `LEFT`(a, 3) FROM b support.', function() {
+  it('test11 SELECT `LEFT`(a, 3) FROM b support.', function () {
     testParser('SELECT `LEFT`(a, 3) FROM b');
   });
 
-  it('test12', function() {
+  it('test12', function () {
     testParser(`
       select
           a.product_id,
@@ -202,7 +202,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test13', function() {
+  it('test13', function () {
     testParser(`
       SELECT
           a.*, f.ORG_NAME DEPT_NAME,
@@ -286,7 +286,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test14', function() {
+  it('test14', function () {
     testParser(`
       SELECT
           k.*,
@@ -345,7 +345,7 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('test15', function() {
+  it('test15', function () {
     testParser(`
       SELECT   P1.PAYMENTNO, P1.AMOUNT, (P1.AMOUNT * 100) / SUM(P2.AMOUNT)
       FROM     PENALTIES AS P1, PENALTIES AS P2
@@ -354,41 +354,41 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('limit support.', function() {
+  it('limit support.', function () {
     testParser('select a from b limit 2, 3');
   });
 
-  it('fix not equal.', function() {
+  it('fix not equal.', function () {
     testParser('select a from b where a <> 1 limit 2, 3');
   });
 
-  it('restore semicolon.', function() {
+  it('restore semicolon.', function () {
     testParser('select a from b limit 2;');
   });
 
-  it('recognoce alias for sql-function calls in stringify function.', function() {
+  it('recognoce alias for sql-function calls in stringify function.', function () {
     testParser('SELECT COUNT(*) AS total, a b, b as c, c/2 d, d & e an FROM b');
   });
 
-  it('union support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function() {
+  it('union support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function () {
     testParser('select a from dual union select a from foo;');
   });
 
-  it('union Parenthesized support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function() {
+  it('union Parenthesized support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function () {
     testParser('(select a from dual) union (select a from foo) order by a desc limit 100, 100;');
   });
 
-  it('union all support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function() {
+  it('union all support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function () {
     testParser('(select a from dual) union all (select a from foo) order by a limit 100');
   });
 
-  it('union distinct support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function() {
+  it('union distinct support, https://dev.mysql.com/doc/refman/8.0/en/union.html', function () {
     testParser(
       'select a from dual order by a desc limit 1, 1 union distinct select a from foo order by a limit 1'
     );
   });
 
-  it('support quoted alias', function() {
+  it('support quoted alias', function () {
     testParser('select a as `A-A` from b limit 2;');
     testParser('select a as `A#A` from b limit 2;');
     testParser('select a as `A?A` from b limit 2;');
@@ -398,7 +398,7 @@ describe('select grammar support', function() {
     testParser('select a as `A A` from b limit 2;');
   });
 
-  it('bugfix table alias', function() {
+  it('bugfix table alias', function () {
     testParser(`
     SELECT stime, A.names, B.names FROM (
       SELECT stime, names FROM iaas_data.iaas_d3c0d0681cc1900
@@ -408,13 +408,32 @@ describe('select grammar support', function() {
     `);
   });
 
-  it('bugfix table alias2', function() {
+  it('bugfix table alias2', function () {
     testParser('select a.* from a t1 join b t2 on t1.a = t2.a')
-  })
-
+  });
   it('place holder support', function() {
     testParser(
     "select sum(quota_value) value, busi_col2 as sh, ${a} as a, YEAR(now()) from der_quota_summary where table_ename = 'gshmyyszje_derivedidx' and cd = (select id from t1 where a = ${t1})"
     )
-  }) 
+  });
+
+  it('support quoted alias: multiple alias and orderby support', function () {
+    testParser('select a as `A A`, b as `B B` from z');
+    testParser('select a as `A A` from z order by `A A` desc');
+    testParser('select a as `A A`, b as `B B` from z group by `A A`, `B B` order by `A A` desc');
+  });
+
+  it('support double quoted alias', function () {
+    testParser('select a as "A A" from z');
+    testParser('select a as "A A" from z order by "A A" desc');
+  });
+
+  it('support quoted alias', function () {
+    testParser('select a as \'A A\' from z');
+    testParser('select a as \'"A#A\' from z order by \'"A#A\' desc');
+  });
+
+  it('test IDENTIFIER', function () {
+    testParser('select `aa#sfs`(a) as \'A A\' from z');
+  });
 });