From e2bf2463401d51e07e0209c23ddbf43445dc710c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 27 May 2014 11:07:32 +0200 Subject: [PATCH] [#3277] SQLite DECIMAL(p, s) types are not correctly recognised - Regenerated test database --- .../tables/T_639NumbersTable.java | 14 ++-- .../generatedclasses/tables/XUnused.java | 4 +- .../records/T_639NumbersTableRecord.java | 84 +++++++++---------- .../tables/records/XUnusedRecord.java | 24 +++--- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java index a0764ad692..1957c73c77 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java +++ b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/T_639NumbersTable.java @@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class T_639NumbersTable extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 218833624; + private static final long serialVersionUID = 338620898; /** * The singleton instance of t_639_numbers_table @@ -52,32 +52,32 @@ public class T_639NumbersTable extends org.jooq.impl.TableImplt_639_numbers_table.BYTE_DECIMAL. */ - public static final org.jooq.TableField BYTE_DECIMAL = createField("BYTE_DECIMAL", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(2, 0)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField BYTE_DECIMAL = createField("BYTE_DECIMAL", org.jooq.impl.SQLDataType.TINYINT, T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.SHORT_DECIMAL. */ - public static final org.jooq.TableField SHORT_DECIMAL = createField("SHORT_DECIMAL", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(4, 0)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField SHORT_DECIMAL = createField("SHORT_DECIMAL", org.jooq.impl.SQLDataType.SMALLINT, T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.INTEGER_DECIMAL. */ - public static final org.jooq.TableField INTEGER_DECIMAL = createField("INTEGER_DECIMAL", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(9, 0)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField INTEGER_DECIMAL = createField("INTEGER_DECIMAL", org.jooq.impl.SQLDataType.INTEGER, T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.LONG_DECIMAL. */ - public static final org.jooq.TableField LONG_DECIMAL = createField("LONG_DECIMAL", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(18, 0)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField LONG_DECIMAL = createField("LONG_DECIMAL", org.jooq.impl.SQLDataType.BIGINT, T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.BIG_INTEGER. */ - public static final org.jooq.TableField BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(22, 0)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField BIG_INTEGER = createField("BIG_INTEGER", org.jooq.impl.SQLDataType.DECIMAL_INTEGER.precision(22), T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.BIG_DECIMAL. */ - public static final org.jooq.TableField BIG_DECIMAL = createField("BIG_DECIMAL", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(22, 5)"), T_639_NUMBERS_TABLE, ""); + public static final org.jooq.TableField BIG_DECIMAL = createField("BIG_DECIMAL", org.jooq.impl.SQLDataType.NUMERIC.precision(22, 5), T_639_NUMBERS_TABLE, ""); /** * The column t_639_numbers_table.FLOAT. diff --git a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java index bb1c7c61cc..7317b17ec2 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java +++ b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/XUnused.java @@ -9,7 +9,7 @@ package org.jooq.test.sqlite.generatedclasses.tables; @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class XUnused extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1966456461; + private static final long serialVersionUID = 182021772; /** * The singleton instance of x_unused @@ -92,7 +92,7 @@ public class XUnused extends org.jooq.impl.TableImplx_unused.FIELD 737. */ - public static final org.jooq.TableField FIELD_737 = createField("FIELD 737", org.jooq.impl.DefaultDataType.getDefaultDataType("DECIMAL(25, 2)"), X_UNUSED, ""); + public static final org.jooq.TableField FIELD_737 = createField("FIELD 737", org.jooq.impl.SQLDataType.NUMERIC.precision(25, 2), X_UNUSED, ""); /** * No further instances allowed diff --git a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/records/T_639NumbersTableRecord.java index 936cfe0329..83486507ef 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/records/T_639NumbersTableRecord.java +++ b/jOOQ-test/src/test/java/org/jooq/test/sqlite/generatedclasses/tables/records/T_639NumbersTableRecord.java @@ -7,9 +7,9 @@ package org.jooq.test.sqlite.generatedclasses.tables.records; * This class is generated by jOOQ. */ @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record13 { +public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record13 { - private static final long serialVersionUID = 1604994766; + private static final long serialVersionUID = -1419860909; /** * Setter for t_639_numbers_table.ID. @@ -84,85 +84,85 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImplt_639_numbers_table.BYTE_DECIMAL. */ - public void setByteDecimal(java.lang.Object value) { + public void setByteDecimal(java.lang.Byte value) { setValue(5, value); } /** * Getter for t_639_numbers_table.BYTE_DECIMAL. */ - public java.lang.Object getByteDecimal() { - return (java.lang.Object) getValue(5); + public java.lang.Byte getByteDecimal() { + return (java.lang.Byte) getValue(5); } /** * Setter for t_639_numbers_table.SHORT_DECIMAL. */ - public void setShortDecimal(java.lang.Object value) { + public void setShortDecimal(java.lang.Short value) { setValue(6, value); } /** * Getter for t_639_numbers_table.SHORT_DECIMAL. */ - public java.lang.Object getShortDecimal() { - return (java.lang.Object) getValue(6); + public java.lang.Short getShortDecimal() { + return (java.lang.Short) getValue(6); } /** * Setter for t_639_numbers_table.INTEGER_DECIMAL. */ - public void setIntegerDecimal(java.lang.Object value) { + public void setIntegerDecimal(java.lang.Integer value) { setValue(7, value); } /** * Getter for t_639_numbers_table.INTEGER_DECIMAL. */ - public java.lang.Object getIntegerDecimal() { - return (java.lang.Object) getValue(7); + public java.lang.Integer getIntegerDecimal() { + return (java.lang.Integer) getValue(7); } /** * Setter for t_639_numbers_table.LONG_DECIMAL. */ - public void setLongDecimal(java.lang.Object value) { + public void setLongDecimal(java.lang.Long value) { setValue(8, value); } /** * Getter for t_639_numbers_table.LONG_DECIMAL. */ - public java.lang.Object getLongDecimal() { - return (java.lang.Object) getValue(8); + public java.lang.Long getLongDecimal() { + return (java.lang.Long) getValue(8); } /** * Setter for t_639_numbers_table.BIG_INTEGER. */ - public void setBigInteger(java.lang.Object value) { + public void setBigInteger(java.math.BigInteger value) { setValue(9, value); } /** * Getter for t_639_numbers_table.BIG_INTEGER. */ - public java.lang.Object getBigInteger() { - return (java.lang.Object) getValue(9); + public java.math.BigInteger getBigInteger() { + return (java.math.BigInteger) getValue(9); } /** * Setter for t_639_numbers_table.BIG_DECIMAL. */ - public void setBigDecimal(java.lang.Object value) { + public void setBigDecimal(java.math.BigDecimal value) { setValue(10, value); } /** * Getter for t_639_numbers_table.BIG_DECIMAL. */ - public java.lang.Object getBigDecimal() { - return (java.lang.Object) getValue(10); + public java.math.BigDecimal getBigDecimal() { + return (java.math.BigDecimal) getValue(10); } /** @@ -213,7 +213,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { + public org.jooq.Row13 fieldsRow() { return (org.jooq.Row13) super.fieldsRow(); } @@ -221,7 +221,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { + public org.jooq.Row13 valuesRow() { return (org.jooq.Row13) super.valuesRow(); } @@ -269,7 +269,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field6() { + public org.jooq.Field field6() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.BYTE_DECIMAL; } @@ -277,7 +277,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field7() { + public org.jooq.Field field7() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.SHORT_DECIMAL; } @@ -285,7 +285,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field8() { + public org.jooq.Field field8() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.INTEGER_DECIMAL; } @@ -293,7 +293,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field9() { + public org.jooq.Field field9() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.LONG_DECIMAL; } @@ -301,7 +301,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field10() { + public org.jooq.Field field10() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.BIG_INTEGER; } @@ -309,7 +309,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl field11() { + public org.jooq.Field field11() { return org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.BIG_DECIMAL; } @@ -373,7 +373,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record14 { +public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl implements org.jooq.Record14 { - private static final long serialVersionUID = -550145500; + private static final long serialVersionUID = 12717580; /** * Setter for x_unused.ID. @@ -196,15 +196,15 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImplx_unused.FIELD 737. */ - public void setField_737(java.lang.Object value) { + public void setField_737(java.math.BigDecimal value) { setValue(13, value); } /** * Getter for x_unused.FIELD 737. */ - public java.lang.Object getField_737() { - return (java.lang.Object) getValue(13); + public java.math.BigDecimal getField_737() { + return (java.math.BigDecimal) getValue(13); } // ------------------------------------------------------------------------- @@ -227,7 +227,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { + public org.jooq.Row14 fieldsRow() { return (org.jooq.Row14) super.fieldsRow(); } @@ -235,7 +235,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { + public org.jooq.Row14 valuesRow() { return (org.jooq.Row14) super.valuesRow(); } @@ -347,7 +347,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl field14() { + public org.jooq.Field field14() { return org.jooq.test.sqlite.generatedclasses.tables.XUnused.FIELD_737; } @@ -459,7 +459,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl