Commit 82bae7e2 authored by terrymanu's avatar terrymanu
Browse files

fix #610

parent de8eac34

RELEASE-NOTES.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
### 功能提升

1. [ISSUE #608](https://github.com/shardingjdbc/sharding-jdbc/issues/608) 支持MySQL的USE语句

1. [ISSUE #609](https://github.com/shardingjdbc/sharding-jdbc/issues/609) 支持MySQL的SHOW语句

1. [ISSUE #610](https://github.com/shardingjdbc/sharding-jdbc/issues/610) 优化不包含表的DQL

1. [ISSUE #611](https://github.com/shardingjdbc/sharding-jdbc/issues/611) 支持MySQL的DESC语句



## 2.0.3

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/routing/DatabaseTest.java

+9 −9
Original line number Diff line number Diff line
@@ -17,23 +17,23 @@ 


package io.shardingjdbc.core.routing;



import com.google.common.base.Function;

import com.google.common.collect.Collections2;

import io.shardingjdbc.core.api.HintManager;

import io.shardingjdbc.core.api.config.ShardingRuleConfiguration;

import io.shardingjdbc.core.api.config.strategy.HintShardingStrategyConfiguration;

import io.shardingjdbc.core.rule.ShardingRule;

import io.shardingjdbc.core.constant.DatabaseType;

import io.shardingjdbc.core.jdbc.core.ShardingContext;

import io.shardingjdbc.core.fixture.OrderDatabaseHintShardingAlgorithm;

import com.google.common.base.Function;

import com.google.common.collect.Collections2;

import io.shardingjdbc.core.jdbc.core.ShardingContext;

import io.shardingjdbc.core.rule.ShardingRule;

import org.junit.Before;

import org.junit.Test;



import javax.sql.DataSource;

import java.sql.SQLException;

import java.util.Collection;

import java.util.HashMap;

import java.util.HashSet;

import java.util.LinkedHashMap;

import java.util.Map;

import java.util.Set;
@@ -49,7 +49,7 @@ public class DatabaseTest { 
    public void setRouteRuleContext() throws SQLException {

        ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();

        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new HintShardingStrategyConfiguration(OrderDatabaseHintShardingAlgorithm.class.getName()));

        Map<String, DataSource> dataSourceMap = new HashMap<>();

        Map<String, DataSource> dataSourceMap = new LinkedHashMap<>();

        dataSourceMap.put("ds_0", null);

        dataSourceMap.put("ds_1", null);

        shardingRule = shardingRuleConfig.build(dataSourceMap);
@@ -74,7 +74,7 @@ public class DatabaseTest { 
        String originSql = "select * from tesT";

        ShardingContext shardingContext = new ShardingContext(shardingRule, DatabaseType.MySQL, null, false);

        SQLRouteResult actual = new StatementRoutingEngine(shardingContext).route(originSql);

        assertThat(actual.getExecutionUnits().size(), is(2));

        assertThat(actual.getExecutionUnits().size(), is(1));

        Set<String> actualDataSources = new HashSet<>(Collections2.transform(actual.getExecutionUnits(), new Function<SQLExecutionUnit, String>() {

        

            @Override
@@ -82,8 +82,8 @@ public class DatabaseTest { 
                return input.getDataSource();

            }

        }));

        assertThat(actualDataSources.size(), is(2));

        assertThat(actualDataSources, hasItems("ds_1"));

        assertThat(actualDataSources.size(), is(1));

        assertThat(actualDataSources, hasItems("ds_0"));

        Collection<String> actualSQLs = Collections2.transform(actual.getExecutionUnits(), new Function<SQLExecutionUnit, String>() {

        

            @Override