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

Sharding-JDBC spring namespace enhancement #1211

Merged
merged 36 commits into from
Aug 31, 2018
Merged

Sharding-JDBC spring namespace enhancement #1211

merged 36 commits into from
Aug 31, 2018

Commits on Aug 29, 2018

  1. Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int… 

    …o dev
    @tristaZero
    tristaZero committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    16890fb View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int… 

    …o dev
    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    46b8368 View commit details
    Browse the repository at this point in the history

  2. add MASTER_SLAVE_RULES_TAG

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    e612838 View commit details
    Browse the repository at this point in the history

  3. add <xsd:element name="master-slave-rule">

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    87740fd View commit details
    Browse the repository at this point in the history

  4. add parseMasterSlaveRulesConfig

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    d1a4ca9 View commit details
    Browse the repository at this point in the history

  5. add null == masterSlaveRulesElement ?

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    a74680b View commit details
    Browse the repository at this point in the history

  6. add masterSlaveShardingDataSource

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    f662981 View commit details
    Browse the repository at this point in the history

  7. add assertMasterSlaveShardingDataSource

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    19a4f88 View commit details
    Browse the repository at this point in the history

  8. modify assertMasterSlaveShardingDataSource

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    a0ce400 View commit details
    Browse the repository at this point in the history

  9. add default-key-generator-ref

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    fb00087 View commit details
    Browse the repository at this point in the history

  10. add NoArgsConstructor

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    5fc0b74 View commit details
    Browse the repository at this point in the history

  11. add parseStrategyType

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    81ac90f View commit details
    Browse the repository at this point in the history

  12. add RoundRobinMasterSlaveLoadBalanceAlgorithm test

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    5e29caf View commit details
    Browse the repository at this point in the history

  13. add strategy-ref="randomStrategy"

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    f672767 View commit details
    Browse the repository at this point in the history

  14. add <xsd:element ref="master-slave-rules" minOccurs="0" />

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c71dc19 View commit details
    Browse the repository at this point in the history

  15. add parseMasterSlaveRulesConfig

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    9611790 View commit details
    Browse the repository at this point in the history

  16. add assertMasterSlaveShardingDataSourceByUserStrategy

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    6b2cfe7 View commit details
    Browse the repository at this point in the history

  17. add MASTER_SLAVE_RULES_TAG

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    0178b96 View commit details
    Browse the repository at this point in the history

  18. modify tests

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    1cd8103 View commit details
    Browse the repository at this point in the history

  19. modify test

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    8e52a3a View commit details
    Browse the repository at this point in the history

  20. modify config

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    8835a26 View commit details
    Browse the repository at this point in the history

  21. add default-data-source-name="dbtbl_0"

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    c46fdcf View commit details
    Browse the repository at this point in the history

  22. modify test case

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    02f8220 View commit details
    Browse the repository at this point in the history

  23. delete getRawDataSourceMap

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    b8bbb7b View commit details
    Browse the repository at this point in the history

  24. add datasource/dataSource.xml

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    082b46f View commit details
    Browse the repository at this point in the history

  25. modify config

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    232a301 View commit details
    Browse the repository at this point in the history

  26. add datasource/dataSource.xml import

    @tristaZero
    tristaZero committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    cd31f46 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. modify withNamespaceForMasterSlaveWithStrategyType

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    d196aa9 View commit details
    Browse the repository at this point in the history

  2. modify withNamespaceForMasterSlaveWithStrategyRef

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    203c84a View commit details
    Browse the repository at this point in the history

  3. modify withNamespaceForMasterSlaveWithDefaultStrategy

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    41fe0c1 View commit details
    Browse the repository at this point in the history

  4. modify shardingNamespace

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    9cb97da View commit details
    Browse the repository at this point in the history

  5. modify shardingMasterSlaveNamespace

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    93f9aa6 View commit details
    Browse the repository at this point in the history

  6. modify sharding

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    f0cb470 View commit details
    Browse the repository at this point in the history

  7. modify orchestration-sharding

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    fc3f3b7 View commit details
    Browse the repository at this point in the history

  8. add checkDataSourceType()

    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    45f0fa0 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc int… 

    …o dev
    @tristaZero
    tristaZero committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    1fe6104 View commit details
    Browse the repository at this point in the history