You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2020/03/01 15:22:44 UTC
[GitHub] [incubator-shardingsphere] menghaoranss opened a new pull request
#4545: Issue2010
menghaoranss opened a new pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545
Fixes #2010 .
Changes proposed in this pull request:
- support connectionInitSqls config of dbcp and druid connection pool via spring-boot
- support connectionInitSqls config of dbcp and druid while using orchestration
The following configurations of `connectionInitSqls` has been verified using dbcp and druid connection pools:
+ springboot
```
spring.shardingsphere.datasource.ds_0.connectionInitSqls=set names utf8mb4;,set serverTimezone=UTC;
```
+ yaml
```
connectionInitSqls:
- set names utf8mb4;
- set serverTimezone=UTC;
```
+ namespace
```
<property name="connectionInitSqls">
<list>
<value>set names utf8mb4;</value>
<value>set serverTimezone=UTC;</value>
</list>
</property>
```
+ Using the local and zookeeper config center, the connectionInitSqls is uploaded to the config center as:
```
connectionInitSqls:
- set names utf8mb4;
- set serverTimezone=UTC;
```
+ Configure connectionInitSqls using only Configuration Center
+ Configure connectionInitSqls with UI
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] menghaoranss commented on a change in
pull request #4545: Issue2010
Posted by GitBox <gi...@apache.org>.
menghaoranss commented on a change in pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#discussion_r386827899
##########
File path: shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/config/DataSourceConfigurationTest.java
##########
@@ -83,4 +88,25 @@ public void assertAddAlias() {
assertThat(actual.getProperties().get("jdbcUrl"), is(actual.getProperties().get("url")));
assertThat(actual.getProperties().get("username"), is(actual.getProperties().get("user")));
}
+
+ @Test
+ public void assertGetDataSourceConfigurationWithConnectionInitSqls() throws SQLException {
Review comment:
> connectionInitSqls in HikariDataSource is a String type, but we want to verify a collection type for this issue. also I found that collection type property not existed in in HikariDataSource, it seems that DBCP2 is ok for that
@kimmking @cherrylzhao In HikariDataSource, the configuratoin is connectionInitSql, and it is a String type, i also veryfied HikariDataSource , it's ok. DBCP2 and Druid support Connection type, the only difference is the return parameter of `getConnectionInitsqls` method, DBCP2 return List type, Druid return Connection type, I have done compatibility processing in the pr.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] codecov-io commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
codecov-io commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-595095485
# [Codecov](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=h1) Report
> Merging [#4545](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-shardingsphere/commit/1deb1252c7e10717897e5ad93f8b18b394caa307?src=pr&el=desc) will **increase** coverage by `<.01%`.
> The diff coverage is `100%`.
[](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #4545 +/- ##
============================================
+ Coverage 55.53% 55.53% +<.01%
Complexity 409 409
============================================
Files 1128 1128
Lines 20432 20434 +2
Branches 3787 3788 +1
============================================
+ Hits 11347 11349 +2
Misses 8370 8370
Partials 715 715
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=tree) | Coverage Δ | Complexity Δ | |
|---|---|---|---|
| [...erlying/common/config/DataSourceConfiguration.java](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtdW5kZXJseWluZy9zaGFyZGluZ3NwaGVyZS1jb21tb24vc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL3VuZGVybHlpbmcvY29tbW9uL2NvbmZpZy9EYXRhU291cmNlQ29uZmlndXJhdGlvbi5qYXZh) | `68.42% <100%> (ø)` | `0 <0> (ø)` | :arrow_down: |
| [...hardingsphere/spring/boot/util/DataSourceUtil.java](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545/diff?src=pr&el=tree#diff-c2hhcmRpbmctc3ByaW5nL3NoYXJkaW5nLXNwcmluZy1ib290LXV0aWwvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL3NwcmluZy9ib290L3V0aWwvRGF0YVNvdXJjZVV0aWwuamF2YQ==) | `80% <100%> (+1.73%)` | `0 <0> (ø)` | :arrow_down: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=footer). Last update [1deb125...d2fcdb3](https://codecov.io/gh/apache/incubator-shardingsphere/pull/4545?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593238317
/run tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] kimmking commented on a change in pull
request #4545: Issue2010
Posted by GitBox <gi...@apache.org>.
kimmking commented on a change in pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#discussion_r386165802
##########
File path: shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/config/DataSourceConfigurationTest.java
##########
@@ -83,4 +88,25 @@ public void assertAddAlias() {
assertThat(actual.getProperties().get("jdbcUrl"), is(actual.getProperties().get("url")));
assertThat(actual.getProperties().get("username"), is(actual.getProperties().get("user")));
}
+
+ @Test
+ public void assertGetDataSourceConfigurationWithConnectionInitSqls() throws SQLException {
Review comment:
Here is an integration test.
I suggestion:
1. if do this way, it's neccesary to use HikariDataSource instead of BasicDatasource.
2. creat a table in h2 db, and set an insert sql to initSql, then check it work well by a select and compare.
Or another approach:
just mock a jdbc driver behind HikariDataSource, check hikariDataSource send the initSql to mock jdbc connection/statement.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] coveralls edited a comment on issue
#4545: Issue2010
Posted by GitBox <gi...@apache.org>.
coveralls edited a comment on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593111961
## Pull Request Test Coverage Report for [Build 46](https://coveralls.io/builds/29069140)
* **4** of **4** **(100.0%)** changed or added relevant lines in **2** files are covered.
* **122** unchanged lines in **36** files lost coverage.
* Overall coverage increased (+**0.3%**) to **58.404%**
---
| Files with Coverage Reduction | New Missed Lines | % |
| :-----|--------------|--: |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/DescribeStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FDescribeStatement.java#L30) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowCreateTableStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowCreateTableStatement.java#L30) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/DenyUserStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FDenyUserStatement.java#L29) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/AlterIndexStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FAlterIndexStatement.java#L31) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/CreateIndexStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FCreateIndexStatement.java#L31) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/DropIndexStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FDropIndexStatement.java#L34) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowColumnsStatement.java#L32) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowIndexStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowIndexStatement.java#L32) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/GrantStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FGrantStatement.java#L30) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/RevokeStatement.java](https://coveralls.io/builds/29069140/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FRevokeStatement.java#L30) | 2 | 0% |
<!-- | **Total:** | **122** | | -->
| Totals | [](https://coveralls.io/builds/29069140) |
| :-- | --: |
| Change from base [Build 965](https://coveralls.io/builds/29056288): | 0.3% |
| Covered Lines: | 10525 |
| Relevant Lines: | 18021 |
---
##### 💛 - [Coveralls](https://coveralls.io)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] kimmking commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
kimmking commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593791598
@menghaoranss need some help？
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] menghaoranss commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
menghaoranss commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593794831
> I want to know have you verify the spring-boot, spring-namespace, yaml case in orchestration mode.
@cherrylzhao , yes , i configured connectionInitSqls list via spring-boot, spring-namespace and yaml
in orchestration, the connectionInitSqls list uploaded to configCenter as yaml, and these sqls executed successfully. I also verified only use orchestration without local configuration, it worked well too.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593314965
/run ci
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593361823
/run ci
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] cherrylzhao commented on a change in
pull request #4545: Issue2010
Posted by GitBox <gi...@apache.org>.
cherrylzhao commented on a change in pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#discussion_r386343076
##########
File path: shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/config/DataSourceConfigurationTest.java
##########
@@ -83,4 +88,25 @@ public void assertAddAlias() {
assertThat(actual.getProperties().get("jdbcUrl"), is(actual.getProperties().get("url")));
assertThat(actual.getProperties().get("username"), is(actual.getProperties().get("user")));
}
+
+ @Test
+ public void assertGetDataSourceConfigurationWithConnectionInitSqls() throws SQLException {
Review comment:
connectionInitSqls in HikariDataSource is a String type, but we want to verify a collection type for this issue. also I found that collection type property not existed in in HikariDataSource, it seems that DBCP2 is ok for that
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593314019
/run ci
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593320552
/run ci
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] coveralls edited a comment on issue
#4545: Issue2010
Posted by GitBox <gi...@apache.org>.
coveralls edited a comment on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593111961
## Pull Request Test Coverage Report for [Build 10038](https://coveralls.io/builds/29145450)
* **4** of **4** **(100.0%)** changed or added relevant lines in **2** files are covered.
* **11** unchanged lines in **3** files lost coverage.
* Overall coverage decreased (**-0.04%**) to **59.098%**
---
| Files with Coverage Reduction | New Missed Lines | % |
| :-----|--------------|--: |
| [sharding-scaling/sharding-scaling-core/src/main/java/org/apache/shardingsphere/shardingscaling/core/execute/engine/DefaultSyncTaskExecuteEngine.java](https://coveralls.io/builds/29145450/source?filename=sharding-scaling%2Fsharding-scaling-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fshardingscaling%2Fcore%2Fexecute%2Fengine%2FDefaultSyncTaskExecuteEngine.java#L94) | 2 | 84.85% |
| [sharding-orchestration/sharding-orchestration-core/src/main/java/org/apache/shardingsphere/orchestration/internal/util/IpUtils.java](https://coveralls.io/builds/29145450/source?filename=sharding-orchestration%2Fsharding-orchestration-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Forchestration%2Finternal%2Futil%2FIpUtils.java#L63) | 3 | 76.0% |
| [sharding-scaling/sharding-scaling-core/src/main/java/org/apache/shardingsphere/shardingscaling/core/execute/executor/channel/MemoryChannel.java](https://coveralls.io/builds/29145450/source?filename=sharding-scaling%2Fsharding-scaling-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fshardingscaling%2Fcore%2Fexecute%2Fexecutor%2Fchannel%2FMemoryChannel.java#L61) | 6 | 59.26% |
<!-- | **Total:** | **11** | | -->
| Totals | [](https://coveralls.io/builds/29145450) |
| :-- | --: |
| Change from base [Build 988](https://coveralls.io/builds/29143972): | -0.04% |
| Covered Lines: | 12076 |
| Relevant Lines: | 20434 |
---
##### 💛 - [Coveralls](https://coveralls.io)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] coveralls edited a comment on issue
#4545: Issue2010
Posted by GitBox <gi...@apache.org>.
coveralls edited a comment on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593111961
## Pull Request Test Coverage Report for [Build 40](https://coveralls.io/builds/29064854)
* **4** of **4** **(100.0%)** changed or added relevant lines in **2** files are covered.
* No unchanged relevant lines lost coverage.
* Overall coverage increased (+**0.01%**) to **58.155%**
---
| Totals | [](https://coveralls.io/builds/29064854) |
| :-- | --: |
| Change from base [Build 965](https://coveralls.io/builds/29056288): | 0.01% |
| Covered Lines: | 10536 |
| Relevant Lines: | 18117 |
---
##### 💛 - [Coveralls](https://coveralls.io)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] kimmking commented on a change in pull
request #4545: Issue2010
Posted by GitBox <gi...@apache.org>.
kimmking commented on a change in pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#discussion_r386165802
##########
File path: shardingsphere-underlying/shardingsphere-common/src/test/java/org/apache/shardingsphere/underlying/common/config/DataSourceConfigurationTest.java
##########
@@ -83,4 +88,25 @@ public void assertAddAlias() {
assertThat(actual.getProperties().get("jdbcUrl"), is(actual.getProperties().get("url")));
assertThat(actual.getProperties().get("username"), is(actual.getProperties().get("user")));
}
+
+ @Test
+ public void assertGetDataSourceConfigurationWithConnectionInitSqls() throws SQLException {
Review comment:
Here is a integration test.
I suggestion:
1. if do this way, it's neccesary to use HikariDataSource instead of BasicDatasource.
2. creat a table in h2 db, and set an insert sql to initSql, then check it work well by a select and compare.
Or anothor approach:
just mock a jdbc driver behind HikariDataSource, check hikariDataSource send the initSql to mock jdbc connection/statement.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] coveralls commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
coveralls commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593111961
## Pull Request Test Coverage Report for [Build 9922](https://coveralls.io/builds/29056697)
* **4** of **4** **(100.0%)** changed or added relevant lines in **2** files are covered.
* **3** unchanged lines in **1** file lost coverage.
* Overall coverage decreased (**-0.0009%**) to **58.144%**
---
| Files with Coverage Reduction | New Missed Lines | % |
| :-----|--------------|--: |
| [sharding-orchestration/sharding-orchestration-core/src/main/java/org/apache/shardingsphere/orchestration/internal/util/IpUtils.java](https://coveralls.io/builds/29056697/source?filename=sharding-orchestration%2Fsharding-orchestration-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Forchestration%2Finternal%2Futil%2FIpUtils.java#L63) | 3 | 76.0% |
<!-- | **Total:** | **3** | | -->
| Totals | [](https://coveralls.io/builds/29056697) |
| :-- | --: |
| Change from base [Build 965](https://coveralls.io/builds/29056288): | -0.0009% |
| Covered Lines: | 10534 |
| Relevant Lines: | 18117 |
---
##### 💛 - [Coveralls](https://coveralls.io)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] tuohai666 commented on issue #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
tuohai666 commented on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593313850
/run test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] cherrylzhao merged pull request #4545:
Issue2010
Posted by GitBox <gi...@apache.org>.
cherrylzhao merged pull request #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [incubator-shardingsphere] coveralls edited a comment on issue
#4545: Issue2010
Posted by GitBox <gi...@apache.org>.
coveralls edited a comment on issue #4545: Issue2010
URL: https://github.com/apache/incubator-shardingsphere/pull/4545#issuecomment-593111961
## Pull Request Test Coverage Report for [Build 47](https://coveralls.io/builds/29071233)
* **4** of **4** **(100.0%)** changed or added relevant lines in **2** files are covered.
* **122** unchanged lines in **36** files lost coverage.
* Overall coverage increased (+**0.3%**) to **58.404%**
---
| Files with Coverage Reduction | New Missed Lines | % |
| :-----|--------------|--: |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/DescribeStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FDescribeStatement.java#L30) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowCreateTableStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowCreateTableStatement.java#L30) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/DenyUserStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FDenyUserStatement.java#L29) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/AlterIndexStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FAlterIndexStatement.java#L31) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/CreateIndexStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FCreateIndexStatement.java#L31) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/ddl/DropIndexStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fddl%2FDropIndexStatement.java#L34) | 1 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowColumnsStatement.java#L32) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowIndexStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdal%2Fdialect%2Fmysql%2FShowIndexStatement.java#L32) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/GrantStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FGrantStatement.java#L30) | 2 | 0% |
| [shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dcl/RevokeStatement.java](https://coveralls.io/builds/29071233/source?filename=shardingsphere-sql-parser%2Fshardingsphere-sql-parser-engine%2Fsrc%2Fmain%2Fjava%2Forg%2Fapache%2Fshardingsphere%2Fsql%2Fparser%2Fsql%2Fstatement%2Fdcl%2FRevokeStatement.java#L30) | 2 | 0% |
<!-- | **Total:** | **122** | | -->
| Totals | [](https://coveralls.io/builds/29071233) |
| :-- | --: |
| Change from base [Build 965](https://coveralls.io/builds/29056288): | 0.3% |
| Covered Lines: | 10525 |
| Relevant Lines: | 18021 |
---
##### 💛 - [Coveralls](https://coveralls.io)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services