Commit b78ca054 authored by gaohongtao's avatar gaohongtao
Browse files

fix #18

parent 650bf54f

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/common/ResultSetUtil.java

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.dangdang.ddframe.rdb.sharding.parser.result.merger.GroupByColumn; 
import com.dangdang.ddframe.rdb.sharding.parser.result.merger.OrderByColumn;

import com.dangdang.ddframe.rdb.sharding.parser.result.merger.OrderByColumn.OrderByType;

import com.google.common.base.Preconditions;



import lombok.AccessLevel;

import lombok.RequiredArgsConstructor;
@@ -122,6 +121,8 @@ public final class ResultSetUtil { 
                } else {

                    return new BigDecimal(number.toString());

                }

            case "java.lang.Object":

                return value;

            default:

                throw new ShardingJdbcException("Unsupported data type:%s", convertType);

        }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetUtilTest.java

+10 −10
Original line number Diff line number Diff line
@@ -17,26 +17,25 @@ 


package com.dangdang.ddframe.rdb.sharding.merger;



import static org.hamcrest.CoreMatchers.is;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import java.math.BigDecimal;

import java.sql.ResultSet;

import java.sql.SQLException;

import java.util.Date;



import org.junit.Test;



import com.dangdang.ddframe.rdb.sharding.exception.ShardingJdbcException;

import com.dangdang.ddframe.rdb.sharding.merger.common.ResultSetUtil;

import com.dangdang.ddframe.rdb.sharding.parser.result.merger.GroupByColumn;

import com.dangdang.ddframe.rdb.sharding.parser.result.merger.OrderByColumn;

import com.dangdang.ddframe.rdb.sharding.parser.result.merger.OrderByColumn.OrderByType;

import org.junit.Test;



import static org.hamcrest.CoreMatchers.is;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



public final class ResultSetUtilTest {
@@ -114,6 +113,7 @@ public final class ResultSetUtilTest { 
        assertThat((BigDecimal) ResultSetUtil.convertValue(new BigDecimal("1"), BigDecimal.class), is(new BigDecimal("1")));

        assertThat((BigDecimal) ResultSetUtil.convertValue((short) 1, BigDecimal.class), is(new BigDecimal("1")));

        assertThat((Date) ResultSetUtil.convertValue(new Date(0L), Date.class), is(new Date(0L)));

        assertThat(ResultSetUtil.convertValue((short) 1, Object.class), is((Object)Short.valueOf("1")));

    }

    

    @Test(expected = ShardingJdbcException.class)