diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index d89621a..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -272,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -358,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index d89621a..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -272,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -358,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index d89621a..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -272,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -358,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/src/nl/astraeus/database/sql/mysql/types.sql b/src/nl/astraeus/database/sql/mysql/types.sql index 8e2824f..f917671 100644 --- a/src/nl/astraeus/database/sql/mysql/types.sql +++ b/src/nl/astraeus/database/sql/mysql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index d89621a..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -272,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -358,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/src/nl/astraeus/database/sql/mysql/types.sql b/src/nl/astraeus/database/sql/mysql/types.sql index 8e2824f..f917671 100644 --- a/src/nl/astraeus/database/sql/mysql/types.sql +++ b/src/nl/astraeus/database/sql/mysql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB diff --git a/src/nl/astraeus/database/sql/postgresql/types.sql b/src/nl/astraeus/database/sql/postgresql/types.sql index f0965ab..bbb1ec0 100644 --- a/src/nl/astraeus/database/sql/postgresql/types.sql +++ b/src/nl/astraeus/database/sql/postgresql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BYTEA