aboutsummaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJames Moger <james.moger@gmail.com>2011-08-08 12:43:46 -0400
committerJames Moger <james.moger@gmail.com>2011-08-08 12:43:46 -0400
commit05097c891abcd48a82e8f7c55f14fbd5c38d9cc8 (patch)
tree4eed2b899013f944d35225af8e807a5bb6267085 /src/com
parentf44168da2824063985f8ecfa1a75f9984e8f7fb0 (diff)
downloadiciql-05097c891abcd48a82e8f7c55f14fbd5c38d9cc8.tar.gz
iciql-05097c891abcd48a82e8f7c55f14fbd5c38d9cc8.zip
Do not generate primitive mappings. Prepare v0.6.3 release.v0.6.3
Diffstat (limited to 'src/com')
-rw-r--r--src/com/iciql/Constants.java6
-rw-r--r--src/com/iciql/ModelUtils.java7
2 files changed, 9 insertions, 4 deletions
diff --git a/src/com/iciql/Constants.java b/src/com/iciql/Constants.java
index d78f1db..b010050 100644
--- a/src/com/iciql/Constants.java
+++ b/src/com/iciql/Constants.java
@@ -25,7 +25,7 @@ public class Constants {
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION = "0.6.2";
+ public static final String VERSION = "0.6.3";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
@@ -33,10 +33,10 @@ public class Constants {
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String API_CURRENT = "2";
+ public static final String API_CURRENT = "3";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String API_PREVIOUS = "1";
+ public static final String API_PREVIOUS = "2";
}
diff --git a/src/com/iciql/ModelUtils.java b/src/com/iciql/ModelUtils.java
index 4607e30..579c7f6 100644
--- a/src/com/iciql/ModelUtils.java
+++ b/src/com/iciql/ModelUtils.java
@@ -197,8 +197,13 @@ class ModelUtils {
}
Class<?> mappedClass = null;
for (Class<?> clazz : SUPPORTED_TYPES.keySet()) {
- if (SUPPORTED_TYPES.get(clazz).equalsIgnoreCase(sqlType)) {
+ if (clazz.isPrimitive()) {
+ // do not map from SQL TYPE to primitive type
+ continue;
+ }
+ if (SUPPORTED_TYPES.get(clazz).equalsIgnoreCase(sqlType)) {
mappedClass = clazz;
+
break;
}
}