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

parser: support sql_mode "PIPES_AS_CONCAT" #5012

Merged
merged 53 commits into from Nov 9, 2017

Conversation

Projects
None yet
6 participants
@spongedu
Contributor

spongedu commented Nov 6, 2017

support sql mode "PIPES_AS_CONCAT".

spongedu added some commits Mar 21, 2017

Merge pull request #3 from pingcap/master
Merge master code
Show outdated Hide outdated parser/parser.y Outdated

@zz-jason zz-jason added this to the 1.1 milestone Nov 7, 2017

@coocood

This comment has been minimized.

Show comment
Hide comment
@coocood

coocood Nov 8, 2017

Member

How about rename token || to pipes?
It would be more clear.
pipes is the token name, it can be used as "or" or "concat".

Member

coocood commented Nov 8, 2017

How about rename token || to pipes?
It would be more clear.
pipes is the token name, it can be used as "or" or "concat".

Show outdated Hide outdated parser/parser.y Outdated
@spongedu

This comment has been minimized.

Show comment
Hide comment
@spongedu

spongedu Nov 8, 2017

Contributor

@coocood I think the token name issue can be considered on both sides:

  1. rename || to pipes is clearer, definitely.
  2. current form is more similar to what mysql do. Maybe it's easier to follow later changes in the future.
    What do you think?
Contributor

spongedu commented Nov 8, 2017

@coocood I think the token name issue can be considered on both sides:

  1. rename || to pipes is clearer, definitely.
  2. current form is more similar to what mysql do. Maybe it's easier to follow later changes in the future.
    What do you think?
@coocood

This comment has been minimized.

Show comment
Hide comment
@coocood

coocood Nov 8, 2017

Member

I think we can afford this change, many of our token names are not exactly the same as MySQL.

And, don't forget to align parser.y by tab.

Member

coocood commented Nov 8, 2017

I think we can afford this change, many of our token names are not exactly the same as MySQL.

And, don't forget to align parser.y by tab.

@spongedu

This comment has been minimized.

Show comment
Hide comment
@spongedu

spongedu Nov 8, 2017

Contributor

@coocood ok. I'll fix this soon

Contributor

spongedu commented Nov 8, 2017

@coocood ok. I'll fix this soon

spongedu added some commits Nov 8, 2017

@winkyao

This comment has been minimized.

Show comment
Hide comment
@winkyao

winkyao Nov 9, 2017

Member

Please fix conflict. @spongedu

Member

winkyao commented Nov 9, 2017

Please fix conflict. @spongedu

Show outdated Hide outdated parser/parser.y Outdated

spongedu added some commits Nov 9, 2017

Merge remote-tracking branch 'upstream/master' into mode_pipes_as_concat
Conflicts:
	mysql/const.go
	mysql/const_test.go
	parser/lexer.go
	parser/parser.y
@spongedu

This comment has been minimized.

Show comment
Hide comment
@spongedu

spongedu Nov 9, 2017

Contributor

Done @winkyao . PTAL

Contributor

spongedu commented Nov 9, 2017

Done @winkyao . PTAL

Merge remote-tracking branch 'upstream/master' into mode_pipes_as_concat
Conflicts:
	mysql/const.go
	mysql/const_test.go
@coocood

This comment has been minimized.

Show comment
Hide comment
@coocood

coocood Nov 9, 2017

Member

LGTM

Member

coocood commented Nov 9, 2017

LGTM

@coocood

coocood approved these changes Nov 9, 2017

@coocood coocood added the status/LGT2 label Nov 9, 2017

@coocood coocood merged commit e188235 into pingcap:master Nov 9, 2017

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
ci/circleci Your tests passed on CircleCI!
Details
jenkins-ci-tidb/build Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details

@spongedu spongedu deleted the spongedu:mode_pipes_as_concat branch Nov 9, 2017

dbjoa added a commit to cloud-pi/tidb that referenced this pull request Nov 30, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment