Skip to content

Commit

Permalink
JDBC-317 Fix incorrect values for NUM_PREC_RADIX in getColumns and ge…
Browse files Browse the repository at this point in the history 
…tTypeInfo
  • Loading branch information
@mrotteveel
mrotteveel committed Jul 27, 2013
1 parent 129f804 commit 81e1b25
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 39 deletions.
30 changes: 12 additions & 18 deletions src/main/org/firebirdsql/jdbc/FBDatabaseMetaData.java
View file
Expand Up @@ -2570,14 +2570,13 @@ public ResultSet getColumns(String catalog, String schemaPattern,

// Defaults: some are overridden in the switch
row[8] = null;
row[9] = null;
row[9] = RADIX_TEN;
row[15] = null;
switch (dataType){
case Types.DECIMAL:
case Types.NUMERIC:
row[6] = createInt(rs.getShort("FIELD_PRECISION"));
row[8] = createInt(fieldScale * (-1));
row[9] = RADIX_TEN;
break;
case Types.CHAR:
case Types.VARCHAR:
Expand All @@ -2591,26 +2590,21 @@ public ResultSet getColumns(String catalog, String schemaPattern,
break;
case Types.FLOAT:
row[6] = FLOAT_PRECISION;
row[9] = RADIX_TEN;
break;
case Types.DOUBLE:
row[6] = DOUBLE_PRECISION;
row[9] = RADIX_TEN;
break;
case Types.BIGINT:
row[6] = BIGINT_PRECISION;
row[8] = INT_ZERO;
row[9] = RADIX_TEN;
break;
case Types.INTEGER:
row[6] = INTEGER_PRECISION;
row[8] = INT_ZERO;
row[9] = RADIX_TEN;
break;
case Types.SMALLINT:
row[6] = SMALLINT_PRECISION;
row[8] = INT_ZERO;
row[9] = RADIX_TEN;
break;
case Types.DATE:
row[6] = DATE_PRECISION;
Expand Down Expand Up @@ -4041,18 +4035,18 @@ public ResultSet getTypeInfo() throws SQLException {
//LONGVARBINARY=-4
rows.add(new byte[][]{ getBytes("BLOB SUB_TYPE 0"), createShort(Types.LONGVARBINARY), INT_ZERO, null, null,
null, TYPE_NULLABLE, CASESENSITIVE, TYPE_PRED_NONE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null,
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_BINARY });
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_TEN });

//LONGVARCHAR=-1
rows.add(new byte[][]{ getBytes("BLOB SUB_TYPE 1"), createShort(Types.LONGVARCHAR), INT_ZERO, null, null,
null, TYPE_NULLABLE, CASESENSITIVE, TYPE_PRED_NONE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null,
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_BINARY });
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_TEN });

//CHAR=1
rows.add(new byte[][]{ getBytes("CHAR"), createShort(Types.CHAR), createInt(32664), getBytes("'"),
getBytes("'"), getBytes("length"), TYPE_NULLABLE, CASESENSITIVE, TYPE_SEARCHABLE, UNSIGNED,
FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_TEXT), null,
RADIX_BINARY });
RADIX_TEN });

//NUMERIC=2
rows.add(new byte[][]{ getBytes("NUMERIC"), createShort(Types.NUMERIC), NUMERIC_PRECISION, null, null,
Expand All @@ -4077,43 +4071,43 @@ FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL
//FLOAT=6
rows.add(new byte[][]{ getBytes("FLOAT"), createShort(Types.FLOAT), FLOAT_PRECISION, null, null, null,
TYPE_NULLABLE, CASEINSENSITIVE, TYPE_SEARCHABLE, SIGNED, VARIABLESCALE, NOTAUTOINC, null, SHORT_ZERO,
SHORT_ZERO, createInt(ISCConstants.SQL_FLOAT), null, RADIX_BINARY });
SHORT_ZERO, createInt(ISCConstants.SQL_FLOAT), null, RADIX_TEN });

//DOUBLE=8
rows.add(new byte[][]{ getBytes("DOUBLE PRECISION"), createShort(Types.DOUBLE), DOUBLE_PRECISION, null, null,
null, TYPE_NULLABLE, CASEINSENSITIVE, TYPE_SEARCHABLE, SIGNED, VARIABLESCALE, NOTAUTOINC, null,
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_DOUBLE), null, RADIX_BINARY });
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_DOUBLE), null, RADIX_TEN });

//VARCHAR=12
rows.add(new byte[][]{ getBytes("VARCHAR"), createShort(Types.VARCHAR), createInt(32664), getBytes("'"),
getBytes("'"), getBytes("length"), TYPE_NULLABLE, CASESENSITIVE, TYPE_SEARCHABLE, UNSIGNED,
FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_VARYING), null,
RADIX_BINARY });
RADIX_TEN });

//DATE=91
rows.add(new byte[][]{ getBytes("DATE"), createShort(Types.DATE), DATE_PRECISION, null, null, null,
TYPE_NULLABLE, CASEINSENSITIVE, TYPE_SEARCHABLE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO,
SHORT_ZERO, createInt(ISCConstants.SQL_TYPE_DATE), null, RADIX_BINARY });
SHORT_ZERO, createInt(ISCConstants.SQL_TYPE_DATE), null, RADIX_TEN });

//TIME=92
rows.add(new byte[][]{ getBytes("TIME"), createShort(Types.TIME), TIME_PRECISION, null, null, null,
TYPE_NULLABLE, CASEINSENSITIVE, TYPE_SEARCHABLE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO,
SHORT_ZERO, createInt(ISCConstants.SQL_TYPE_TIME), null, RADIX_BINARY });
SHORT_ZERO, createInt(ISCConstants.SQL_TYPE_TIME), null, RADIX_TEN });

//TIMESTAMP=93
rows.add(new byte[][]{ getBytes("TIMESTAMP"), createShort(Types.TIMESTAMP), TIMESTAMP_PRECISION, null, null,
null, TYPE_NULLABLE, CASEINSENSITIVE, TYPE_SEARCHABLE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null,
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_TIMESTAMP), null, RADIX_BINARY });
SHORT_ZERO, SHORT_ZERO, createInt(ISCConstants.SQL_TIMESTAMP), null, RADIX_TEN });

//OTHER=1111
rows.add(new byte[][]{ getBytes("ARRAY"), createShort(Types.OTHER), INT_ZERO, null, null, null, TYPE_NULLABLE,
CASESENSITIVE, TYPE_PRED_NONE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO, SHORT_ZERO,
createInt(ISCConstants.SQL_ARRAY), null, RADIX_BINARY });
createInt(ISCConstants.SQL_ARRAY), null, RADIX_TEN });

//BLOB=2004
rows.add(new byte[][]{ getBytes("BLOB SUB_TYPE <0 "), createShort(Types.BLOB), INT_ZERO, null, null, null,
TYPE_NULLABLE, CASESENSITIVE, TYPE_PRED_NONE, UNSIGNED, FIXEDSCALE, NOTAUTOINC, null, SHORT_ZERO,
SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_BINARY });
SHORT_ZERO, createInt(ISCConstants.SQL_BLOB), null, RADIX_TEN });

return new FBResultSet(xsqlvars, rows);
}
Expand Down
22 changes: 1 addition & 21 deletions src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataColumns.java
View file
Expand Up @@ -119,7 +119,6 @@ public void testIntegerColumn() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "INTEGER");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 10);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
// Explicit comment:
validationRules.put(ColumnMetaData.REMARKS, "Some comment");
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 1);
Expand All @@ -138,7 +137,6 @@ public void testInteger_DefaultNullColumn() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "INTEGER");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 10);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 32);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");
validationRules.put(ColumnMetaData.COLUMN_DEF, "NULL");
Expand All @@ -155,7 +153,6 @@ public void testInteger_Default999Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "INTEGER");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 10);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 33);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");
validationRules.put(ColumnMetaData.COLUMN_DEF, "999");
Expand All @@ -173,7 +170,6 @@ public void testInteger_NotNullColumn() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "INTEGER");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 10);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 30);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");
validationRules.put(ColumnMetaData.NULLABLE, DatabaseMetaData.columnNoNulls);
Expand All @@ -192,7 +188,6 @@ public void testBigintColumn() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "BIGINT");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 19);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 2);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -209,7 +204,6 @@ public void testSmallintColumn() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "SMALLINT");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 5);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 3);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -225,7 +219,6 @@ public void testDoublePrecisionColumn() throws Exception {
validationRules.put(ColumnMetaData.DATA_TYPE, Types.DOUBLE);
validationRules.put(ColumnMetaData.TYPE_NAME, "DOUBLE PRECISION");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 15);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 4);

validate("test_column_metadata", "col_double", validationRules);
Expand All @@ -240,7 +233,6 @@ public void testFloatColumn() throws Exception {
validationRules.put(ColumnMetaData.DATA_TYPE, Types.FLOAT);
validationRules.put(ColumnMetaData.TYPE_NAME, "FLOAT");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 7);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 5);

validate("test_column_metadata", "col_float", validationRules);
Expand All @@ -256,7 +248,6 @@ public void testDecimal18_2Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 18);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 2);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 6);

validate("test_column_metadata", "col_dec18_2", validationRules);
Expand All @@ -275,7 +266,6 @@ public void testDecimal18_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 18);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 7);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -292,7 +282,6 @@ public void testDecimal7_3Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 7);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 3);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 8);

validate("test_column_metadata", "col_dec7_3", validationRules);
Expand All @@ -311,7 +300,6 @@ public void testDecimal7_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 7);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 9);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -328,7 +316,6 @@ public void testDecimal4_3Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 4);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 3);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 10);

validate("test_column_metadata", "col_dec4_3", validationRules);
Expand All @@ -347,7 +334,6 @@ public void testDecimal4_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "DECIMAL");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 4);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 11);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -364,7 +350,6 @@ public void testNumeric18_2Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 18);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 2);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 12);

validate("test_column_metadata", "col_num18_2", validationRules);
Expand All @@ -383,7 +368,6 @@ public void testNumeric18_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 18);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 13);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -400,7 +384,6 @@ public void testNumeric7_3Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 7);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 3);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 14);

validate("test_column_metadata", "col_num7_3", validationRules);
Expand All @@ -419,7 +402,6 @@ public void testNumeric7_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 7);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 15);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand All @@ -436,7 +418,6 @@ public void testNumeric4_3Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 4);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 3);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 16);

validate("test_column_metadata", "col_num4_3", validationRules);
Expand All @@ -455,7 +436,6 @@ public void testNumeric4_0Column() throws Exception {
validationRules.put(ColumnMetaData.TYPE_NAME, "NUMERIC");
validationRules.put(ColumnMetaData.COLUMN_SIZE, 4);
validationRules.put(ColumnMetaData.DECIMAL_DIGITS, 0);
validationRules.put(ColumnMetaData.NUM_PREC_RADIX, 10);
validationRules.put(ColumnMetaData.ORDINAL_POSITION, 17);
validationRules.put(ColumnMetaData.IS_AUTOINCREMENT, "");

Expand Down Expand Up @@ -751,7 +731,7 @@ private void validate(String tableName, String columnName, Map<ColumnMetaData, O
defaults.put(ColumnMetaData.TABLE_SCHEM, null);
defaults.put(ColumnMetaData.BUFFER_LENGTH, null);
defaults.put(ColumnMetaData.DECIMAL_DIGITS, null);
defaults.put(ColumnMetaData.NUM_PREC_RADIX, null);
defaults.put(ColumnMetaData.NUM_PREC_RADIX, 10);
defaults.put(ColumnMetaData.NULLABLE, DatabaseMetaData.columnNullable);
defaults.put(ColumnMetaData.REMARKS, null);
defaults.put(ColumnMetaData.COLUMN_DEF, null);
Expand Down

0 comments on commit 81e1b25

Please sign in to comment.