chore: hotfix support quoted alias: multiple alias and orderby support.

albin3 · albin3 · commit 09b15e42d288 · 2021-02-04T18:32:10.000+08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,3 +9,4 @@
 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"
diff --git a/README.md b/README.md
@@ -10,7 +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.0 [#40](https://github.com/JavaScriptor/js-sql-parser/issues/40), [#44](https://github.com/JavaScriptor/js-sql-parser/issues/44)
+- 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)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-sql-parser",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "",
   "main": "./dist/parser/sqlParser.js",
   "scripts": {
diff --git a/src/sqlParser.jison b/src/sqlParser.jison
@@ -128,7 +128,7 @@ UNION                                                             return 'UNION'
 \.                                                                return 'DOT'
 ["][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'
-[`].+[`]                                                          return 'IDENTIFIER'
+([`])(?:(?=(\\?))\2.)*?\1                                         return 'IDENTIFIER'
 
 <<EOF>>                                                           return 'EOF'
 .                                                                 return 'INVALID'
diff --git a/test/main.test.js b/test/main.test.js
@@ -428,7 +428,7 @@ describe('select grammar support', function () {
     testParser('select a as \'"A#A\' from z order by \'"A#A\' desc');
   });
 
-  it.only('test IDENTIFIER', function () {
+  it('test IDENTIFIER', function () {
     testParser('select `aa#sfs`(a) as \'A A\' from z');
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-sql-parser",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./dist/parser/sqlParser.js",`
`6`	`6`	`"scripts": {`