Skip to content

Commit

Permalink
Let USING have parenthesis to fix #1983
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasrw authored Dec 29, 2024
1 parent 61b770a commit 523a231
Show file tree
Hide file tree
Showing 4 changed files with 775 additions and 561 deletions.
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
"postversion": "npm publish && git push && git push --tags && echo \"Successfully released version $npm_package_version\""
},
"dependencies": {
"cross-fetch": "4",
"cross-fetch": "4.1.0",
"yargs": "16"
},
"devDependencies": {
"blueimp-md5": "2.19.0",
"cmdmix": "2.2.2",
"dom-storage": "2.1.0",
"esbuild": "0.24.0",
"esbuild": "0.24.2",
"git-branch-is": "4.0.0",
"husky": "8.0.3",
"jison": "^0.4.18",
Expand All @@ -67,14 +67,15 @@
"tabletop": "1.6.3",
"uglify-js": "3.19.3"
},
"X-resolutions": {
"got": "14.4.2",
"resolutions": {
"got": "14",
"axios": "1",
"json5": "2",
"underscore": "1",
"glob-parent": "6",
"decode-uri-component": "0.2",
"semver": "7"
"decode-uri-component": "0.4",
"semver": "7",
"follow-redirects": "1"
},
"engines": {
"node": ">=15"
Expand Down
4 changes: 4 additions & 0 deletions src/alasqlparser.jison
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,8 @@ OnClause
{ $$ = {on: $2}; }
| USING ColumnsList
{ $$ = {using: $2}; }
| USING LPAR ColumnsList RPAR
{ $$ = {using: $3}; }
|
{ $$ = undefined; }
;
Expand Down Expand Up @@ -2688,6 +2690,8 @@ MergeInto
MergeUsing
: USING FromTable
{ $$ = {using: $2}; }
| USING LPAR FromTable RPAR
{ $$ = {using: $3}; }
;

MergeOn
Expand Down
733 changes: 368 additions & 365 deletions src/alasqlparser.js

Large diffs are not rendered by default.

Loading

0 comments on commit 523a231

Please sign in to comment.