Skip to content

Commit 2068fec

Browse files
committed
fix: add missing test column definitions
1 parent b550f87 commit 2068fec

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

src/main/resources/com/google/cloud/spanner/jdbc/DatabaseMetaData_GetColumns.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME, COLU
2121
WHEN SPANNER_TYPE LIKE 'BYTES%' THEN -2
2222
WHEN SPANNER_TYPE = 'DATE' THEN 91
2323
WHEN SPANNER_TYPE = 'FLOAT64' THEN 8
24+
WHEN SPANNER_TYPE = 'FLOAT32' THEN 7
2425
WHEN SPANNER_TYPE = 'INT64' THEN -5
2526
WHEN SPANNER_TYPE = 'NUMERIC' THEN 2
2627
WHEN SPANNER_TYPE LIKE 'STRING%' THEN -9
@@ -34,6 +35,7 @@ SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME, COLU
3435
WHEN SPANNER_TYPE = 'INT64' OR SPANNER_TYPE = 'ARRAY<INT64>' THEN 19
3536
WHEN SPANNER_TYPE = 'NUMERIC' OR SPANNER_TYPE = 'ARRAY<NUMERIC>' THEN 15
3637
WHEN SPANNER_TYPE = 'FLOAT64' OR SPANNER_TYPE = 'ARRAY<FLOAT64>' THEN 15
38+
WHEN SPANNER_TYPE = 'FLOAT32' OR SPANNER_TYPE = 'ARRAY<FLOAT32>' THEN 15
3739
WHEN SPANNER_TYPE = 'BOOL' OR SPANNER_TYPE = 'ARRAY<BOOL>' THEN NULL
3840
WHEN SPANNER_TYPE = 'DATE' OR SPANNER_TYPE = 'ARRAY<DATE>' THEN 10
3941
WHEN SPANNER_TYPE = 'TIMESTAMP' OR SPANNER_TYPE = 'ARRAY<TIMESTAMP>' THEN 35
@@ -45,12 +47,14 @@ SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME, COLU
4547
0 AS BUFFER_LENGTH,
4648
CASE
4749
WHEN SPANNER_TYPE LIKE '%FLOAT64%' THEN 16
50+
WHEN SPANNER_TYPE LIKE '%FLOAT32%' THEN 16
4851
ELSE NULL
4952
END AS DECIMAL_DIGITS,
5053
CASE
5154
WHEN SPANNER_TYPE LIKE '%INT64%' THEN 10
5255
WHEN SPANNER_TYPE LIKE '%NUMERIC%' THEN 10
5356
WHEN SPANNER_TYPE LIKE '%FLOAT64%' THEN 2
57+
WHEN SPANNER_TYPE LIKE '%FLOAT32%' THEN 2
5458
ELSE NULL
5559
END AS NUM_PREC_RADIX,
5660
CASE

src/main/resources/com/google/cloud/spanner/jdbc/postgresql/DatabaseMetaData_GetColumns.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SELECT TABLE_CATALOG AS "TABLE_CAT", TABLE_SCHEMA AS "TABLE_SCHEM", TABLE_NAME A
2121
WHEN DATA_TYPE LIKE 'bytea' THEN -2
2222
WHEN DATA_TYPE = 'date' THEN 91
2323
WHEN DATA_TYPE = 'double precision' THEN 8
24+
WHEN DATA_TYPE = 'single precision' THEN 7
2425
WHEN DATA_TYPE = 'bigint' THEN -5
2526
WHEN DATA_TYPE = 'numeric' THEN 2
2627
WHEN DATA_TYPE LIKE 'character varying' THEN -9
@@ -34,6 +35,7 @@ SELECT TABLE_CATALOG AS "TABLE_CAT", TABLE_SCHEMA AS "TABLE_SCHEM", TABLE_NAME A
3435
WHEN DATA_TYPE LIKE 'bytea' THEN 10485760
3536
WHEN DATA_TYPE = 'date' THEN 10
3637
WHEN DATA_TYPE = 'double precision' THEN 15
38+
WHEN DATA_TYPE = 'single precision' THEN 15
3739
WHEN DATA_TYPE = 'bigint' THEN 19
3840
WHEN DATA_TYPE = 'numeric' THEN 15
3941
WHEN DATA_TYPE LIKE 'character varying' THEN CHARACTER_MAXIMUM_LENGTH
@@ -43,13 +45,15 @@ SELECT TABLE_CATALOG AS "TABLE_CAT", TABLE_SCHEMA AS "TABLE_SCHEM", TABLE_NAME A
4345
0 AS "BUFFER_LENGTH",
4446
CASE
4547
WHEN DATA_TYPE LIKE 'double precision' THEN 16
48+
WHEN DATA_TYPE LIKE 'single precision' THEN 16
4649
WHEN DATA_TYPE LIKE 'numeric' THEN 16383
4750
ELSE NULL
4851
END AS "DECIMAL_DIGITS",
4952
CASE
5053
WHEN DATA_TYPE LIKE 'bigint' THEN 10
5154
WHEN DATA_TYPE LIKE 'numeric' THEN 10
5255
WHEN DATA_TYPE LIKE 'double precision' THEN 2
56+
WHEN DATA_TYPE LIKE 'single precision' THEN 2
5357
ELSE NULL
5458
END AS "NUM_PREC_RADIX",
5559
CASE

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDatabaseMetaDataTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ private Column(
149149
Arrays.asList(
150150
new Column("ColInt64", Types.BIGINT, "INT64", 19, null, 10, false, null),
151151
new Column("ColFloat64", Types.DOUBLE, "FLOAT64", 15, 16, 2, false, null),
152+
new Column("ColFloat32", Types.REAL, "FLOAT32", 15, 16, 2, false, null),
152153
new Column("ColBool", Types.BOOLEAN, "BOOL", null, null, null, false, null),
153154
new Column("ColString", Types.NVARCHAR, "STRING(100)", 100, null, null, false, 100),
154155
new Column(
@@ -162,6 +163,7 @@ private Column(
162163
new Column("ColJson", Types.NVARCHAR, "JSON", 2621440, null, null, false, 2621440),
163164
new Column("ColInt64Array", Types.ARRAY, "ARRAY<INT64>", 19, null, 10, true, null),
164165
new Column("ColFloat64Array", Types.ARRAY, "ARRAY<FLOAT64>", 15, 16, 2, true, null),
166+
new Column("ColFloat32Array", Types.ARRAY, "ARRAY<FLOAT32>", 15, 16, 2, true, null),
165167
new Column("ColBoolArray", Types.ARRAY, "ARRAY<BOOL>", null, null, null, true, null),
166168
new Column(
167169
"ColStringArray", Types.ARRAY, "ARRAY<STRING(100)>", 100, null, null, true, 100),

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgDatabaseMetaDataTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ private Column(
148148
Arrays.asList(
149149
new Column("colint64", Types.BIGINT, "bigint", 19, null, 10, false, null),
150150
new Column("colfloat64", Types.DOUBLE, "double precision", 15, 16, 2, false, null),
151+
new Column("colfloat32", Types.REAL, "single precision", 15, 16, 2, false, null),
151152
new Column("colbool", Types.BOOLEAN, "boolean", null, null, null, false, null),
152153
new Column("colstring", Types.NVARCHAR, "character varying", 100, null, null, false, 100),
153154
new Column(

0 commit comments

Comments
 (0)