Skip to content

Commit 523a231

Browse files
authored
Let USING have parenthesis to fix #1983
1 parent 61b770a commit 523a231

File tree

4 files changed

+775
-561
lines changed

4 files changed

+775
-561
lines changed

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
"postversion": "npm publish && git push && git push --tags && echo \"Successfully released version $npm_package_version\""
4646
},
4747
"dependencies": {
48-
"cross-fetch": "4",
48+
"cross-fetch": "4.1.0",
4949
"yargs": "16"
5050
},
5151
"devDependencies": {
5252
"blueimp-md5": "2.19.0",
5353
"cmdmix": "2.2.2",
5454
"dom-storage": "2.1.0",
55-
"esbuild": "0.24.0",
55+
"esbuild": "0.24.2",
5656
"git-branch-is": "4.0.0",
5757
"husky": "8.0.3",
5858
"jison": "^0.4.18",
@@ -67,14 +67,15 @@
6767
"tabletop": "1.6.3",
6868
"uglify-js": "3.19.3"
6969
},
70-
"X-resolutions": {
71-
"got": "14.4.2",
70+
"resolutions": {
71+
"got": "14",
7272
"axios": "1",
7373
"json5": "2",
7474
"underscore": "1",
7575
"glob-parent": "6",
76-
"decode-uri-component": "0.2",
77-
"semver": "7"
76+
"decode-uri-component": "0.4",
77+
"semver": "7",
78+
"follow-redirects": "1"
7879
},
7980
"engines": {
8081
"node": ">=15"

src/alasqlparser.jison

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,8 @@ OnClause
10291029
{ $$ = {on: $2}; }
10301030
| USING ColumnsList
10311031
{ $$ = {using: $2}; }
1032+
| USING LPAR ColumnsList RPAR
1033+
{ $$ = {using: $3}; }
10321034
|
10331035
{ $$ = undefined; }
10341036
;
@@ -2688,6 +2690,8 @@ MergeInto
26882690
MergeUsing
26892691
: USING FromTable
26902692
{ $$ = {using: $2}; }
2693+
| USING LPAR FromTable RPAR
2694+
{ $$ = {using: $3}; }
26912695
;
26922696

26932697
MergeOn

src/alasqlparser.js

Lines changed: 368 additions & 365 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)