Commit 9133933d authored by terrymanu's avatar terrymanu
Browse files

refactor merger into ShardingResultSet 2nd version

parent 359cf585

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        <snakeyaml.version>1.16</snakeyaml.version>

        <springframework.version>4.1.1.RELEASE</springframework.version>

        <mysql-connector-java.version>5.1.30</mysql-connector-java.version>

        <h2.version>1.4.184</h2.version>

        <h2.version>1.4.196</h2.version>

        <postgresql.version>9.1-901-1.jdbc4</postgresql.version>

        <mssql.version>6.1.7.jre7-preview</mssql.version>

        <junit.version>4.12</junit.version>

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/resultset/ShardingResultSet.java

+2 −1
Original line number Diff line number Diff line
@@ -338,8 +338,9 @@ public final class ShardingResultSet extends AbstractResultSetAdapter { 
    }

    

    @Override

    // TODO should return sharding statement in future

    public Statement getStatement() throws SQLException {

        return mergeResultSet.getCurrentResultSet().getStatement();

        return getResultSets().get(0).getStatement();

    }

    

    @Override

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/ResultSetGetterAdapterTest.java

+0 −25
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import java.sql.ResultSet; 
import java.sql.SQLException;

import java.sql.Statement;

import java.util.Calendar;

import java.util.Collections;



import static org.hamcrest.CoreMatchers.instanceOf;

import static org.hamcrest.CoreMatchers.is;
@@ -392,28 +391,4 @@ public final class ResultSetGetterAdapterTest extends AbstractShardingDatabaseOn 
    public void assertGetObjectForColumnLabel() throws SQLException {

        assertThat(actual.getObject("uid").toString(), is("10"));

    }

    

    @Test

    public void assertGetObjectForColumnIndexWithMap() throws SQLException {

        if (DatabaseType.H2 == AbstractDBUnitTest.CURRENT_DB_TYPE) {

            try {

                actual.getObject(1, Collections.<String, Class<?>>emptyMap());

            } catch (final SQLException ignore) {

            }

        } else {

            assertThat(actual.getObject(1, Collections.<String, Class<?>>emptyMap()).toString(), is("10"));

        }

    }

    

    @Test

    public void assertGetObjectForColumnLabelWithMap() throws SQLException {

        if (DatabaseType.H2 == AbstractDBUnitTest.CURRENT_DB_TYPE) {

            try {

                actual.getObject("uid", Collections.<String, Class<?>>emptyMap());

            } catch (final SQLException ignore) {

            }

        } else {

            assertThat(actual.getObject("uid", Collections.<String, Class<?>>emptyMap()).toString(), is("10"));

        }

    }

}