Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

fixed unit_of_time #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sockstack wants to merge 4 commits into JavaScriptor:master from sockstack:fix-unit-of-time
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed unit_of_time 
fixed unit_of_time
  • Loading branch information
sockstack committed Aug 28, 2020
commit b2810d2d598cdaa9e6544997064f886e623d89d8
48 changes: 48 additions & 0 deletions src/sqlParser.jison
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,30 @@ MODE return 'MODE'
OJ return 'OJ'
LIMIT return 'LIMIT'
UNION return 'UNION'
SECOND return 'SECOND'
MINUTE return 'MINUTE'
HOUR return 'HOUR'
SECONDS return 'SECONDS'
MINUTES return 'MINUTES'
HOURS return 'HOURS'
YEAR return 'YEAR'
MICROSECOND return 'MICROSECOND'
DAY return 'DAY'
WEEK return 'WEEK'
MONTH return 'MONTH'
QUARTER return 'QUARTER'
SECOND_MICROSECOND return 'SECOND_MICROSECOND'
MINUTE_MICROSECOND return 'MINUTE_MICROSECOND'
MINUTE_SECOND return 'MINUTE_SECOND'
HOUR_MICROSECOND return 'HOUR_MICROSECOND'
HOUR_SECOND return 'HOUR_SECOND'
HOUR_MINUTE return 'HOUR_MINUTE'
DAY_MICROSECOND return 'DAY_MICROSECOND'
DAY_SECOND return 'DAY_SECOND'
DAY_MINUTE return 'DAY_MINUTE'
DAY_HOUR return 'DAY_HOUR'
YEAR_MONTH return 'YEAR_MONTH'
INTERVAL return 'INTERVAL'

"," return ','
"=" return '='
Expand Down Expand Up @@ -426,6 +450,30 @@ expr
| expr OR expr { $$ = { type: 'OrExpression', operator: 2,ドル left: 1,ドル right: 3ドル } }
| expr AND expr { $$ = { type: 'AndExpression', operator: 2,ドル left: 1,ドル right: 3ドル } }
| expr XOR expr { $$ = { type: 'XORExpression', left: 1,ドル right: 3ドル } }
| INTERVAL expr SECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MINUTE { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr HOUR { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr SECONDS { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MINUTES { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr HOURS { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr YEAR { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MICROSECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr DAY { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr WEEK { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MONTH { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr QUARTER { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr SECOND_MICROSECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MINUTE_MICROSECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr MINUTE_SECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr HOUR_MICROSECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr HOUR_SECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr HOUR_MINUTE { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr DAY_MICROSECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr DAY_SECOND { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr DAY_MINUTE { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr DAY_HOUR { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr YEAR_MONTH { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
| INTERVAL expr INTERVAL { $$ = { type: 'IntervalExpression', value: 2,ドル unit: 3ドル } }
;
expr_list
: expr { $$ = { type: 'ExpressionList', value: [ 1ドル ] } }
Expand Down
5 changes: 5 additions & 0 deletions src/stringify.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,3 +551,8 @@ Sql.prototype.travelSelectParenthesized = function(ast) {
this.travel(ast.value);
this.appendKeyword(')');
};
Sql.prototype.travelIntervalExpression = function (ast) {
this.appendKeyword('interval');
this.travel(ast.value);
this.appendKeyword(ast.unit);
};
12 changes: 12 additions & 0 deletions test/main.test.js
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,4 +411,16 @@ describe('select grammar support', function() {
it('bugfix table alias2', function() {
testParser('select a.* from a t1 join b t2 on t1.a = t2.a')
})

it('bugfix unit_of_time1', function() {
testParser(`
SELECT a, b, DATE_SUB(NOW(),INTERVAL 1 YEAR) as time from t1
`)
})

it('bugfix unit_of_time1', function() {
testParser(`
SELECT a, b from t1 where created_at >= DATE_SUB(NOW(),INTERVAL 1 MONTH)
`)
})
});

AltStyle によって変換されたページ (->オリジナル) /