Skip to content

Commit d2dfa4c

Browse files
nicktorwaldTotktonada
authored andcommitted
jdbc: remove the outdated tarantool sql types
NUMERIC/DATE-related types were removed and BLOB type was replaced by SCALAR in scope of new SQL type changes. See tarantool/tarantool#4019 for more information. Fixes #130.
1 parent 50c5181 commit d2dfa4c

File tree

3 files changed

+8
-30
lines changed

3 files changed

+8
-30
lines changed

Diff for: src/test/java/org/tarantool/jdbc/JdbcPreparedStatementIT.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void testSetLong() throws SQLException {
189189
@Test
190190
public void testSetString() throws SQLException {
191191
makeHelper(String.class)
192-
.setColumns(TntSqlType.CHAR, TntSqlType.VARCHAR, TntSqlType.TEXT)
192+
.setColumns(TntSqlType.VARCHAR, TntSqlType.TEXT)
193193
.setValues(STRING_VALS)
194194
.testSetParameter();
195195
}
@@ -213,9 +213,7 @@ public void testSetDouble() throws SQLException {
213213
@Test
214214
public void testSetBigDecimal() throws SQLException {
215215
makeHelper(BigDecimal.class)
216-
.setColumns(TntSqlType.DECIMAL, TntSqlType.DECIMAL_PREC, TntSqlType.DECIMAL_PREC_SCALE,
217-
TntSqlType.NUMERIC, TntSqlType.NUMERIC_PREC, TntSqlType.NUMERIC_PREC_SCALE,
218-
TntSqlType.NUM, TntSqlType.NUM_PREC, TntSqlType.NUM_PREC_SCALE)
216+
.setColumns(TntSqlType.REAL, TntSqlType.FLOAT, TntSqlType.DOUBLE)
219217
.setValues(BIGDEC_VALS)
220218
.testSetParameter();
221219
}
@@ -224,7 +222,7 @@ public void testSetBigDecimal() throws SQLException {
224222
@Test
225223
public void testSetByteArray() throws SQLException {
226224
makeHelper(byte[].class)
227-
.setColumns(TntSqlType.BLOB)
225+
.setColumns(TntSqlType.SCALAR)
228226
.setValues(BINARY_VALS)
229227
.testSetParameter();
230228
}

Diff for: src/test/java/org/tarantool/jdbc/JdbcResultSetIT.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ public void testGetLongColumn() throws SQLException {
8585
@Test
8686
public void testGetBigDecimalColumn() throws SQLException {
8787
makeHelper(BigDecimal.class)
88-
.setColumns(TntSqlType.DECIMAL, TntSqlType.DECIMAL_PREC, TntSqlType.DECIMAL_PREC_SCALE,
89-
TntSqlType.NUMERIC, TntSqlType.NUMERIC_PREC, TntSqlType.NUMERIC_PREC_SCALE,
90-
TntSqlType.NUM, TntSqlType.NUM_PREC, TntSqlType.NUM_PREC_SCALE)
88+
.setColumns(TntSqlType.REAL, TntSqlType.FLOAT, TntSqlType.DOUBLE)
9189
.setValues(BIGDEC_VALS)
9290
.testGetColumn();
9391
}
@@ -111,15 +109,15 @@ public void testGetDoubleColumn() throws SQLException {
111109
@Test
112110
public void testGetStringColumn() throws SQLException {
113111
makeHelper(String.class)
114-
.setColumns(TntSqlType.CHAR, TntSqlType.VARCHAR, TntSqlType.TEXT)
112+
.setColumns(TntSqlType.VARCHAR, TntSqlType.TEXT)
115113
.setValues(STRING_VALS)
116114
.testGetColumn();
117115
}
118116

119117
@Test
120118
public void testGetByteArrayColumn() throws SQLException {
121119
makeHelper(byte[].class)
122-
.setColumns(TntSqlType.BLOB)
120+
.setColumns(TntSqlType.SCALAR)
123121
.setValues(BINARY_VALS)
124122
.testGetColumn();
125123
}

Diff for: src/test/java/org/tarantool/jdbc/TntSqlType.java

+2-20
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,19 @@
44
* Enumeration of SQL types recognizable by tarantool.
55
*/
66
public enum TntSqlType {
7-
FLOAT("FLOAT"),
87

8+
FLOAT("FLOAT"),
99
DOUBLE("DOUBLE"),
10-
1110
REAL("REAL"),
1211

1312
INT("INT"),
1413
INTEGER("INTEGER"),
1514

16-
DECIMAL("DECIMAL"),
17-
DECIMAL_PREC("DECIMAL(20)"),
18-
DECIMAL_PREC_SCALE("DECIMAL(20,10)"),
19-
20-
NUMERIC("NUMERIC"),
21-
NUMERIC_PREC("NUMERIC(20)"),
22-
NUMERIC_PREC_SCALE("NUMERIC(20,10)"),
23-
24-
NUM("NUM"),
25-
NUM_PREC("NUM(20)"),
26-
NUM_PREC_SCALE("NUM(20,10)"),
27-
28-
CHAR("CHAR(128)"),
29-
3015
VARCHAR("VARCHAR(128)"),
31-
3216
TEXT("TEXT"),
3317

34-
BLOB("BLOB");
18+
SCALAR("SCALAR");
3519

36-
//DATE("DATE"),
37-
//TIME("TIME"),
3820
//TIMESTAMP("TIMESTAMP"),
3921

4022
public String sqlType;

0 commit comments

Comments
 (0)