diff --git a/presto-product-tests/src/main/java/io/prestosql/tests/jdbc/PreparedStatements.java b/presto-product-tests/src/main/java/io/prestosql/tests/jdbc/PreparedStatements.java index 48b509e4017a..b5857e66c06a 100644 --- a/presto-product-tests/src/main/java/io/prestosql/tests/jdbc/PreparedStatements.java +++ b/presto-product-tests/src/main/java/io/prestosql/tests/jdbc/PreparedStatements.java @@ -13,7 +13,6 @@ */ package io.prestosql.tests.jdbc; -import io.airlift.log.Logger; import io.prestodb.tempto.ProductTest; import io.prestodb.tempto.Requirement; import io.prestodb.tempto.RequirementsProvider; @@ -42,7 +41,6 @@ import static io.prestosql.tests.TestGroups.JDBC; import static io.prestosql.tests.TestGroups.SIMBA_JDBC; import static io.prestosql.tests.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE; -import static io.prestosql.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver; import static java.sql.JDBCType.BIGINT; import static java.sql.JDBCType.BOOLEAN; import static java.sql.JDBCType.CHAR; @@ -61,7 +59,6 @@ public class PreparedStatements extends ProductTest { - private static final Logger LOGGER = Logger.get(PreparedStatements.class); private static final String TABLE_NAME = "textfile_all_types"; private static final String TABLE_NAME_MUTABLE = "all_types_table_name"; private static final String INSERT_SQL = "INSERT INTO %s VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -91,19 +88,14 @@ public Requirement getRequirements(Configuration configuration) @Requires(ImmutableAllTypesTable.class) public void preparedSelectApi() { - if (usingTeradataJdbcDriver(connection())) { - String selectSql = "SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?"; - final int testValue = 2147483647; + String selectSql = "SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?"; + int testValue = 2147483647; - assertThat(query(selectSql, param(INTEGER, testValue))).containsOnly(row(testValue)); + assertThat(query(selectSql, param(INTEGER, testValue))).containsOnly(row(testValue)); - assertThat(query(selectSql, param(INTEGER, null))).hasNoRows(); + assertThat(query(selectSql, param(INTEGER, null))).hasNoRows(); - assertThat(query(selectSql, param(INTEGER, 2))).hasNoRows(); - } - else { - LOGGER.warn("preparedSelectApi() only applies to TeradataJdbcDriver"); - } + assertThat(query(selectSql, param(INTEGER, 2))).hasNoRows(); } @Test(groups = {JDBC, SIMBA_JDBC}) @@ -111,167 +103,152 @@ public void preparedSelectApi() public void preparedSelectSql() throws SQLException { - if (usingTeradataJdbcDriver(connection())) { - String prepareSql = "PREPARE ps1 from SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?"; - final int testValue = 2147483647; - String executeSql = "EXECUTE ps1 using "; + String prepareSql = "PREPARE ps1 from SELECT c_int FROM " + TABLE_NAME + " WHERE c_int = ?"; + int testValue = 2147483647; + String executeSql = "EXECUTE ps1 using "; - Statement statement = connection().createStatement(); - statement.execute(prepareSql); + Statement statement = connection().createStatement(); + statement.execute(prepareSql); - assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + testValue))) - .containsOnly(row(testValue)); - assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + "NULL"))) - .hasNoRows(); - assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + 2))) - .hasNoRows(); - } - else { - LOGGER.warn("preparedSelectSql() only applies to TeradataJdbcDriver"); - } + assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + testValue))) + .containsOnly(row(testValue)); + assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + "NULL"))) + .hasNoRows(); + assertThat(QueryResult.forResultSet(statement.executeQuery(executeSql + 2))) + .hasNoRows(); } @Test(groups = {JDBC, SIMBA_JDBC}) @Requires(MutableAllTypesTable.class) public void preparedInsertVarbinaryApi() { - if (usingTeradataJdbcDriver(connection())) { - String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); - String insertSqlWithTable = String.format(INSERT_SQL, tableNameInDatabase); - String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); + String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); + String insertSqlWithTable = String.format(INSERT_SQL, tableNameInDatabase); + String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); - defaultQueryExecutor().executeQuery( - insertSqlWithTable, - param(TINYINT, null), - param(SMALLINT, null), - param(INTEGER, null), - param(BIGINT, null), - param(FLOAT, null), - param(DOUBLE, null), - param(DECIMAL, null), - param(DECIMAL, null), - param(TIMESTAMP, null), - param(DATE, null), - param(VARCHAR, null), - param(VARCHAR, null), - param(CHAR, null), - param(BOOLEAN, null), - param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); + defaultQueryExecutor().executeQuery( + insertSqlWithTable, + param(TINYINT, null), + param(SMALLINT, null), + param(INTEGER, null), + param(BIGINT, null), + param(FLOAT, null), + param(DOUBLE, null), + param(DECIMAL, null), + param(DECIMAL, null), + param(TIMESTAMP, null), + param(DATE, null), + param(VARCHAR, null), + param(VARCHAR, null), + param(CHAR, null), + param(BOOLEAN, null), + param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); - QueryResult result = defaultQueryExecutor().executeQuery(selectSqlWithTable); - assertColumnTypes(result); - assertThat(result).containsOnly( - row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, - new byte[] {0, 1, 2, 3, 0, 42, -7})); - } - else { - LOGGER.warn("preparedInsertVarbinaryApi() only applies to TeradataJdbcDriver"); - } + QueryResult result = defaultQueryExecutor().executeQuery(selectSqlWithTable); + assertColumnTypes(result); + assertThat(result).containsOnly( + row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, + new byte[] {0, 1, 2, 3, 0, 42, -7})); } @Test(groups = {JDBC, SIMBA_JDBC}) @Requires(MutableAllTypesTable.class) public void preparedInsertApi() { - if (usingTeradataJdbcDriver(connection())) { - String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); - String insertSqlWithTable = String.format(INSERT_SQL, tableNameInDatabase); - String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); + String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); + String insertSqlWithTable = String.format(INSERT_SQL, tableNameInDatabase); + String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); - query( - insertSqlWithTable, - param(TINYINT, 127), - param(SMALLINT, 32767), - param(INTEGER, 2147483647), - param(BIGINT, new BigInteger("9223372036854775807")), - param(FLOAT, Float.valueOf("123.345")), - param(DOUBLE, 234.567), - param(DECIMAL, BigDecimal.valueOf(345)), - param(DECIMAL, BigDecimal.valueOf(345.678)), - param(TIMESTAMP, Timestamp.valueOf("2015-05-10 12:15:35")), - param(DATE, Date.valueOf("2015-05-10")), - param(VARCHAR, "ala ma kota"), - param(VARCHAR, "ala ma kot"), - param(CHAR, " ala ma"), - param(BOOLEAN, Boolean.TRUE), - param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); + query( + insertSqlWithTable, + param(TINYINT, 127), + param(SMALLINT, 32767), + param(INTEGER, 2147483647), + param(BIGINT, new BigInteger("9223372036854775807")), + param(FLOAT, Float.valueOf("123.345")), + param(DOUBLE, 234.567), + param(DECIMAL, BigDecimal.valueOf(345)), + param(DECIMAL, BigDecimal.valueOf(345.678)), + param(TIMESTAMP, Timestamp.valueOf("2015-05-10 12:15:35")), + param(DATE, Date.valueOf("2015-05-10")), + param(VARCHAR, "ala ma kota"), + param(VARCHAR, "ala ma kot"), + param(CHAR, " ala ma"), + param(BOOLEAN, Boolean.TRUE), + param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); - query( - insertSqlWithTable, - param(TINYINT, 1), - param(SMALLINT, 2), - param(INTEGER, 3), - param(BIGINT, 4), - param(FLOAT, Float.valueOf("5.6")), - param(DOUBLE, 7.8), - param(DECIMAL, BigDecimal.valueOf(91)), - param(DECIMAL, BigDecimal.valueOf(2.3)), - param(TIMESTAMP, Timestamp.valueOf("2012-05-10 1:35:15")), - param(DATE, Date.valueOf("2014-03-10")), - param(VARCHAR, "abc"), - param(VARCHAR, "def"), - param(CHAR, " ghi"), - param(BOOLEAN, Boolean.FALSE), - param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); + query( + insertSqlWithTable, + param(TINYINT, 1), + param(SMALLINT, 2), + param(INTEGER, 3), + param(BIGINT, 4), + param(FLOAT, Float.valueOf("5.6")), + param(DOUBLE, 7.8), + param(DECIMAL, BigDecimal.valueOf(91)), + param(DECIMAL, BigDecimal.valueOf(2.3)), + param(TIMESTAMP, Timestamp.valueOf("2012-05-10 1:35:15")), + param(DATE, Date.valueOf("2014-03-10")), + param(VARCHAR, "abc"), + param(VARCHAR, "def"), + param(CHAR, " ghi"), + param(BOOLEAN, Boolean.FALSE), + param(VARBINARY, new byte[] {0, 1, 2, 3, 0, 42, -7})); - query( - insertSqlWithTable, - param(TINYINT, null), - param(SMALLINT, null), - param(INTEGER, null), - param(BIGINT, null), - param(FLOAT, null), - param(DOUBLE, null), - param(DECIMAL, null), - param(DECIMAL, null), - param(TIMESTAMP, null), - param(DATE, null), - param(VARCHAR, null), - param(VARCHAR, null), - param(CHAR, null), - param(BOOLEAN, null), - param(VARBINARY, null)); + query( + insertSqlWithTable, + param(TINYINT, null), + param(SMALLINT, null), + param(INTEGER, null), + param(BIGINT, null), + param(FLOAT, null), + param(DOUBLE, null), + param(DECIMAL, null), + param(DECIMAL, null), + param(TIMESTAMP, null), + param(DATE, null), + param(VARCHAR, null), + param(VARCHAR, null), + param(CHAR, null), + param(BOOLEAN, null), + param(VARBINARY, null)); - QueryResult result = query(selectSqlWithTable); - assertColumnTypes(result); - assertThat(result).containsOnly( - row( - 127, - 32767, - 2147483647, - new Long("9223372036854775807"), - Float.valueOf("123.345"), - 234.567, - BigDecimal.valueOf(345), - new BigDecimal("345.67800"), - Timestamp.valueOf("2015-05-10 12:15:35"), - Date.valueOf("2015-05-10"), - "ala ma kota", - "ala ma kot", - " ala ma", - Boolean.TRUE, - new byte[] {0, 1, 2, 3, 0, 42, -7}), - row( - 1, - 2, - 3, - 4L, - Float.valueOf("5.6"), - 7.8, - BigDecimal.valueOf(91), - BigDecimal.valueOf(2.3), - Timestamp.valueOf("2012-05-10 1:35:15"), - Date.valueOf("2014-03-10"), - "abc", - "def", - " ghi", - Boolean.FALSE, - new byte[] {0, 1, 2, 3, 0, 42, -7}), - row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)); - } - else { - LOGGER.warn("preparedInsertApi() only applies to TeradataJdbcDriver"); - } + QueryResult result = query(selectSqlWithTable); + assertColumnTypes(result); + assertThat(result).containsOnly( + row( + 127, + 32767, + 2147483647, + new Long("9223372036854775807"), + Float.valueOf("123.345"), + 234.567, + BigDecimal.valueOf(345), + new BigDecimal("345.67800"), + Timestamp.valueOf("2015-05-10 12:15:35"), + Date.valueOf("2015-05-10"), + "ala ma kota", + "ala ma kot", + " ala ma", + Boolean.TRUE, + new byte[] {0, 1, 2, 3, 0, 42, -7}), + row( + 1, + 2, + 3, + 4L, + Float.valueOf("5.6"), + 7.8, + BigDecimal.valueOf(91), + BigDecimal.valueOf(2.3), + Timestamp.valueOf("2012-05-10 1:35:15"), + Date.valueOf("2014-03-10"), + "abc", + "def", + " ghi", + Boolean.FALSE, + new byte[] {0, 1, 2, 3, 0, 42, -7}), + row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)); } @Test(groups = {JDBC, SIMBA_JDBC}) @@ -279,105 +256,100 @@ public void preparedInsertApi() public void preparedInsertSql() throws SQLException { - if (usingTeradataJdbcDriver(connection())) { - String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); - String insertSqlWithTable = "PREPARE ps1 from " + String.format(INSERT_SQL, tableNameInDatabase); - String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); - String executeSql = "EXECUTE ps1 using "; + String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); + String insertSqlWithTable = "PREPARE ps1 from " + String.format(INSERT_SQL, tableNameInDatabase); + String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); + String executeSql = "EXECUTE ps1 using "; - Statement statement = connection().createStatement(); - statement.execute(insertSqlWithTable); - statement.execute(executeSql + - "cast(127 as tinyint), " + - "cast(32767 as smallint), " + - "2147483647, " + - "9223372036854775807, " + - "cast(123.345 as real), " + - "cast(234.567 as double), " + - "cast(345 as decimal(10)), " + - "cast(345.678 as decimal(10,5)), " + - "timestamp '2015-05-10 12:15:35', " + - "date '2015-05-10', " + - "'ala ma kota', " + - "'ala ma kot', " + - "cast('ala ma' as char(10)), " + - "true, " + - "X'00010203002AF9'"); + Statement statement = connection().createStatement(); + statement.execute(insertSqlWithTable); + statement.execute(executeSql + + "cast(127 as tinyint), " + + "cast(32767 as smallint), " + + "2147483647, " + + "9223372036854775807, " + + "cast(123.345 as real), " + + "cast(234.567 as double), " + + "cast(345 as decimal(10)), " + + "cast(345.678 as decimal(10,5)), " + + "timestamp '2015-05-10 12:15:35', " + + "date '2015-05-10', " + + "'ala ma kota', " + + "'ala ma kot', " + + "cast('ala ma' as char(10)), " + + "true, " + + "X'00010203002AF9'"); - statement.execute(executeSql + - "cast(1 as tinyint), " + - "cast(2 as smallint), " + - "3, " + - "4, " + - "cast(5.6 as real), " + - "cast(7.8 as double), " + - "cast(9 as decimal(10)), " + - "cast(2.3 as decimal(10,5)), " + - "timestamp '2012-05-10 1:35:15', " + - "date '2014-03-10', " + - "'abc', " + - "'def', " + - "cast('ghi' as char(10)), " + - "false, " + - "varbinary 'jkl'"); + statement.execute(executeSql + + "cast(1 as tinyint), " + + "cast(2 as smallint), " + + "3, " + + "4, " + + "cast(5.6 as real), " + + "cast(7.8 as double), " + + "cast(9 as decimal(10)), " + + "cast(2.3 as decimal(10,5)), " + + "timestamp '2012-05-10 1:35:15', " + + "date '2014-03-10', " + + "'abc', " + + "'def', " + + "cast('ghi' as char(10)), " + + "false, " + + "varbinary 'jkl'"); - statement.execute(executeSql + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null"); + statement.execute(executeSql + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null"); - QueryResult result = query(selectSqlWithTable); - assertColumnTypes(result); - assertThat(result).containsOnly( - row( - 127, - 32767, - 2147483647, - new Long("9223372036854775807"), - Float.valueOf("123.345"), - 234.567, - BigDecimal.valueOf(345), - new BigDecimal("345.67800"), - Timestamp.valueOf("2015-05-10 12:15:35"), - Date.valueOf("2015-05-10"), - "ala ma kota", - "ala ma kot", - "ala ma ", - Boolean.TRUE, - new byte[] {0, 1, 2, 3, 0, 42, -7}), - row( - 1, - 2, - 3, - 4, - Float.valueOf("5.6"), - 7.8, - BigDecimal.valueOf(9), - new BigDecimal("2.30000"), - Timestamp.valueOf("2012-05-10 1:35:15"), - Date.valueOf("2014-03-10"), - "abc", - "def", - "ghi ", - Boolean.FALSE, - "jkl".getBytes()), - row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)); - } - else { - LOGGER.warn("preparedInsertSql() only applies to TeradataJdbcDriver"); - } + QueryResult result = query(selectSqlWithTable); + assertColumnTypes(result); + assertThat(result).containsOnly( + row( + 127, + 32767, + 2147483647, + new Long("9223372036854775807"), + Float.valueOf("123.345"), + 234.567, + BigDecimal.valueOf(345), + new BigDecimal("345.67800"), + Timestamp.valueOf("2015-05-10 12:15:35"), + Date.valueOf("2015-05-10"), + "ala ma kota", + "ala ma kot", + "ala ma ", + Boolean.TRUE, + new byte[] {0, 1, 2, 3, 0, 42, -7}), + row( + 1, + 2, + 3, + 4, + Float.valueOf("5.6"), + 7.8, + BigDecimal.valueOf(9), + new BigDecimal("2.30000"), + Timestamp.valueOf("2012-05-10 1:35:15"), + Date.valueOf("2014-03-10"), + "abc", + "def", + "ghi ", + Boolean.FALSE, + "jkl".getBytes()), + row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null)); } @Test(groups = {JDBC, SIMBA_JDBC}) @@ -385,40 +357,35 @@ public void preparedInsertSql() public void preparedInsertVarbinarySql() throws SQLException { - if (usingTeradataJdbcDriver(connection())) { - String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); - String insertSqlWithTable = "PREPARE ps1 from " + String.format(INSERT_SQL, tableNameInDatabase); - String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); - String executeSql = "EXECUTE ps1 using "; + String tableNameInDatabase = mutableTablesState().get(TABLE_NAME_MUTABLE).getNameInDatabase(); + String insertSqlWithTable = "PREPARE ps1 from " + String.format(INSERT_SQL, tableNameInDatabase); + String selectSqlWithTable = String.format(SELECT_STAR_SQL, tableNameInDatabase); + String executeSql = "EXECUTE ps1 using "; - Statement statement = connection().createStatement(); - statement.execute(insertSqlWithTable); - statement.execute(executeSql + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "null, " + - "X'00010203002AF9'"); + Statement statement = connection().createStatement(); + statement.execute(insertSqlWithTable); + statement.execute(executeSql + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "null, " + + "X'00010203002AF9'"); - QueryResult result = query(selectSqlWithTable); - assertColumnTypes(result); - assertThat(result).containsOnly( - row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, - new byte[] {0, 1, 2, 3, 0, 42, -7})); - } - else { - LOGGER.warn("preparedInsertVarbinarySql() only applies to TeradataJdbcDriver"); - } + QueryResult result = query(selectSqlWithTable); + assertColumnTypes(result); + assertThat(result).containsOnly( + row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, + new byte[] {0, 1, 2, 3, 0, 42, -7})); } private void assertColumnTypes(QueryResult queryResult)