From 93eff3a3bca2cee613f21bcd8f33c91e6ee7cdb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 31 Oct 2013 15:11:25 +0200 Subject: [PATCH] Improve type mapping #535 --- .../src/main/java/com/mysema/query/sql/JDBCTypeMapping.java | 4 ++-- .../test/java/com/mysema/query/sql/JDBCTypeMappingTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java b/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java index 59d40abfb..f8a517754 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/JDBCTypeMapping.java @@ -115,8 +115,8 @@ public final class JDBCTypeMapping { Pair key = Pair.of(size, digits); if (numericTypes.containsKey(key)) { return numericTypes.get(key); - } else if (digits == 0) { - if (size > 18) { + } else if (digits <= 0) { + if (size > 18 || size == 0) { return Long.class; } else if (size > 5) { return Integer.class; diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java index 5c71c7059..84a948f76 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/sql/JDBCTypeMappingTest.java @@ -75,7 +75,7 @@ public class JDBCTypeMappingTest { assertEquals(typeMapping.get(Types.NUMERIC, 3, 0), Short.class); assertEquals(typeMapping.get(Types.NUMERIC, 2, 0), Byte.class); assertEquals(typeMapping.get(Types.NUMERIC, 1, 0), Boolean.class); - assertEquals(typeMapping.get(Types.NUMERIC, 0, 0), Boolean.class); + assertEquals(typeMapping.get(Types.NUMERIC, 0, 0), Long.class); assertEquals(typeMapping.get(Types.NUMERIC, 17, 2), BigDecimal.class); assertEquals(typeMapping.get(Types.NUMERIC, 5, 2), Double.class);