Skip to content

jdbc: remove the outdated tarantool sql types #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

jdbc: remove the outdated tarantool sql types #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/test/java/org/tarantool/jdbc/JdbcPreparedStatementIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public void testSetLong() throws SQLException {
@Test
public void testSetString() throws SQLException {
makeHelper(String.class)
.setColumns(TntSqlType.CHAR, TntSqlType.VARCHAR, TntSqlType.TEXT)
.setColumns(TntSqlType.VARCHAR, TntSqlType.TEXT)
.setValues(STRING_VALS)
.testSetParameter();
}
Expand All @@ -213,9 +213,7 @@ public void testSetDouble() throws SQLException {
@Test
public void testSetBigDecimal() throws SQLException {
makeHelper(BigDecimal.class)
.setColumns(TntSqlType.DECIMAL, TntSqlType.DECIMAL_PREC, TntSqlType.DECIMAL_PREC_SCALE,
TntSqlType.NUMERIC, TntSqlType.NUMERIC_PREC, TntSqlType.NUMERIC_PREC_SCALE,
TntSqlType.NUM, TntSqlType.NUM_PREC, TntSqlType.NUM_PREC_SCALE)
.setColumns(TntSqlType.REAL, TntSqlType.FLOAT, TntSqlType.DOUBLE)
.setValues(BIGDEC_VALS)
.testSetParameter();
}
Expand All @@ -224,7 +222,7 @@ public void testSetBigDecimal() throws SQLException {
@Test
public void testSetByteArray() throws SQLException {
makeHelper(byte[].class)
.setColumns(TntSqlType.BLOB)
.setColumns(TntSqlType.SCALAR)
.setValues(BINARY_VALS)
.testSetParameter();
}
Expand Down
8 changes: 3 additions & 5 deletions src/test/java/org/tarantool/jdbc/JdbcResultSetIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ public void testGetLongColumn() throws SQLException {
@Test
public void testGetBigDecimalColumn() throws SQLException {
makeHelper(BigDecimal.class)
.setColumns(TntSqlType.DECIMAL, TntSqlType.DECIMAL_PREC, TntSqlType.DECIMAL_PREC_SCALE,
TntSqlType.NUMERIC, TntSqlType.NUMERIC_PREC, TntSqlType.NUMERIC_PREC_SCALE,
TntSqlType.NUM, TntSqlType.NUM_PREC, TntSqlType.NUM_PREC_SCALE)
.setColumns(TntSqlType.REAL, TntSqlType.FLOAT, TntSqlType.DOUBLE)
.setValues(BIGDEC_VALS)
.testGetColumn();
}
Expand All @@ -111,15 +109,15 @@ public void testGetDoubleColumn() throws SQLException {
@Test
public void testGetStringColumn() throws SQLException {
makeHelper(String.class)
.setColumns(TntSqlType.CHAR, TntSqlType.VARCHAR, TntSqlType.TEXT)
.setColumns(TntSqlType.VARCHAR, TntSqlType.TEXT)
.setValues(STRING_VALS)
.testGetColumn();
}

@Test
public void testGetByteArrayColumn() throws SQLException {
makeHelper(byte[].class)
.setColumns(TntSqlType.BLOB)
.setColumns(TntSqlType.SCALAR)
.setValues(BINARY_VALS)
.testGetColumn();
}
Expand Down
22 changes: 2 additions & 20 deletions src/test/java/org/tarantool/jdbc/TntSqlType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,19 @@
* Enumeration of SQL types recognizable by tarantool.
*/
public enum TntSqlType {
FLOAT("FLOAT"),

FLOAT("FLOAT"),
DOUBLE("DOUBLE"),

REAL("REAL"),

INT("INT"),
INTEGER("INTEGER"),

DECIMAL("DECIMAL"),
DECIMAL_PREC("DECIMAL(20)"),
DECIMAL_PREC_SCALE("DECIMAL(20,10)"),

NUMERIC("NUMERIC"),
NUMERIC_PREC("NUMERIC(20)"),
NUMERIC_PREC_SCALE("NUMERIC(20,10)"),

NUM("NUM"),
NUM_PREC("NUM(20)"),
NUM_PREC_SCALE("NUM(20,10)"),

CHAR("CHAR(128)"),

VARCHAR("VARCHAR(128)"),

TEXT("TEXT"),

BLOB("BLOB");
SCALAR("SCALAR");

//DATE("DATE"),
//TIME("TIME"),
//TIMESTAMP("TIMESTAMP"),

public String sqlType;
Expand Down