Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Reconstruct SchemaToken and IndexToken #2374

Merged
merged 18 commits into from
May 13, 2019
Merged

Reconstruct SchemaToken and IndexToken #2374

merged 18 commits into from
May 13, 2019

Conversation

tristaZero
Copy link
Contributor

@tristaZero tristaZero commented May 13, 2019 •
edited
Loading

Fix #2398

  • Question in EncryptWhereColumnPlaceholder, between should not supported
  • Should not call SQLUtil.getExactlyValue on rewrite module, current value should come from parse module. For example: IndexPlaceholder

tristaZero added 18 commits May 13, 2019 14:48
@tristaZero
delete toStringFromBetween() for WhereEncryptColumnPlaceholder
3c1a443
@tristaZero
add schemaName
f314f45
@tristaZero
new SchemaToken()
832c317
@tristaZero
modify test cases for SchemaToken
11bfaa7
@tristaZero
use schemaToken.getSchemaName()
f5bc494
@tristaZero
delete between and for encrypt rewriting
0eb7024
@tristaZero
add indexName
53ce60b
@tristaZero
USE RequiredArgsConstructor
4fa9922
@tristaZero
ADD quoteCharacter
3759c46
@tristaZero
new IndexPlaceholder()
9139e8b
@tristaZero
new IndexToken()
01f29a9
@tristaZero
modify test cases for indexToken
b74ba11
@tristaZero
add quoteCharacter
5320b6e
@tristaZero
modify getter
26463a4
@tristaZero
use schemaToken.getQuoteCharacter()
484fefc
@tristaZero
modify test cases for IndexPlaceholder()
1a76903
@tristaZero
Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int…
28a766c 
…o dev

# Conflicts:
#	sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/token/impl/IndexToken.java
#	sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/token/impl/SchemaToken.java
#	sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/placeholder/IndexPlaceholder.java
@tristaZero
fix import QuoteCharacter
e7623cd
@coveralls
Copy link

Pull Request Test Coverage Report for Build 8035

  • 10 of 20 (50.0%) changed or added relevant lines in 8 files are covered.
  • 4 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.02%) to 18.539%
Changes Missing Coverage Covered Lines Changed/Added Lines %
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/extractor/impl/common/index/IndexExtractor.java 0 1 0.0%
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/filler/common/dal/SchemaFiller.java 0 1 0.0%
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/engine/MasterSlaveSQLRewriteEngine.java 0 1 0.0%
sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/engine/ShardingSQLRewriteEngine.java 3 4 75.0%
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/SQLJudgeEngine.java 2 5 40.0%
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/token/impl/IndexToken.java 0 3 0.0%
Files with Coverage Reduction New Missed Lines %
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/token/impl/SchemaToken.java 1 75.0%
sharding-core/sharding-core-parse/sharding-core-parse-common/src/main/java/org/apache/shardingsphere/core/parse/sql/token/impl/IndexToken.java 3 0.0%
Totals Coverage Status
Change from base Build 8032: -0.02%
Covered Lines: 8659
Relevant Lines: 46708
💛 - Coveralls

@terrymanu terrymanu added this to the 4.0.0.M2 milestone May 13, 2019
@terrymanu terrymanu merged commit 9b86c9b into apache:dev May 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.0.0-RC2
Development

Successfully merging this pull request may close these issues.

Wrong result set for select between and when using encrypt data source
3 participants
@tristaZero @coveralls @terrymanu