Commit 2e74557e authored by terrymanu's avatar terrymanu
Browse files

for #647 move merger to sharding-core module

parent dd9600ea
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public final class SQLJudgeEngine {
                if (isDQL(tokenType)) {
                    return new SelectStatement();
                }
                // TODO use InsertStatement, UpdateStatement ...
                if (isDML(tokenType)) {
                    return new DMLStatement();
                }
+5 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package io.shardingjdbc.core;
import io.shardingjdbc.core.api.AllApiTests;
import io.shardingjdbc.core.constant.AllConstantsTests;
import io.shardingjdbc.core.hint.AllHintTests;
import io.shardingjdbc.core.merger.AllMergerTests;
import io.shardingjdbc.core.parsing.AllParsingTests;
import io.shardingjdbc.core.rewrite.AllRewriteTests;
import io.shardingjdbc.core.routing.AllRoutingTests;
@@ -36,6 +37,7 @@ import org.junit.runners.Suite.SuiteClasses;
        AllParsingTests.class, 
        AllRewriteTests.class, 
        AllRoutingTests.class, 
        AllMergerTests.class, 
        AllHintTests.class
})
public class AllCoreTests {
+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ import com.google.common.base.Optional;
import io.shardingjdbc.core.constant.AggregationType;
import io.shardingjdbc.core.constant.DatabaseType;
import io.shardingjdbc.core.constant.OrderType;
import io.shardingjdbc.core.merger.fixture.TestQueryResult;
import io.shardingjdbc.core.merger.groupby.GroupByMemoryResultSetMerger;
import io.shardingjdbc.core.merger.groupby.GroupByStreamResultSetMerger;
import io.shardingjdbc.core.merger.iterator.IteratorStreamResultSetMerger;
import io.shardingjdbc.core.merger.jdbc.JDBCQueryResult;
import io.shardingjdbc.core.merger.orderby.OrderByStreamResultSetMerger;
import io.shardingjdbc.core.merger.pagination.LimitDecoratorResultSetMerger;
import io.shardingjdbc.core.parsing.parser.context.OrderItem;
@@ -61,7 +61,7 @@ public final class SelectMergeEngineTest {
        when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
        when(resultSetMetaData.getColumnCount()).thenReturn(1);
        when(resultSetMetaData.getColumnLabel(1)).thenReturn("count(*)");
        queryResults = Collections.<QueryResult>singletonList(new JDBCQueryResult(resultSet));
        queryResults = Collections.<QueryResult>singletonList(new TestQueryResult(resultSet));
        selectStatement = new SelectStatement();
    }
    
+0 −0

File moved.

Loading