lowka commented on code in PR #6677: URL: https://github.com/apache/ignite-3/pull/6677#discussion_r2416467808
########## modules/jdbc/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatement2SelfTest.java: ########## @@ -0,0 +1,728 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.jdbc2; + +import static org.apache.ignite.jdbc.util.JdbcTestUtils.assertThrowsSqlException; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import java.io.InputStream; +import java.io.StringReader; +import java.math.BigDecimal; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.Date; +import java.sql.JDBCType; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLXML; +import java.sql.Statement; +import java.sql.Time; +import java.sql.Timestamp; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Arrays; +import java.util.Calendar; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import org.apache.ignite.internal.jdbc.ConnectionProperties; +import org.apache.ignite.internal.jdbc.ConnectionPropertiesImpl; +import org.apache.ignite.sql.IgniteSql; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.mockito.Mockito; + +/** + * Unit tests for {@link JdbcPreparedStatement2}. + */ +public class JdbcPreparedStatement2SelfTest extends JdbcStatement2SelfTest { + + private static final Set<JDBCType> SUPPORTED_TYPES = EnumSet.of( + JDBCType.BOOLEAN, + JDBCType.TINYINT, + JDBCType.SMALLINT, + JDBCType.INTEGER, + JDBCType.BIGINT, + JDBCType.FLOAT, + JDBCType.REAL, + JDBCType.DOUBLE, + JDBCType.DECIMAL, + JDBCType.DATE, + JDBCType.TIME, + JDBCType.TIMESTAMP, + JDBCType.CHAR, + JDBCType.VARCHAR, + JDBCType.BINARY, + JDBCType.VARBINARY, + JDBCType.NULL, + JDBCType.OTHER // UUID. + ); + + @Test + public void assignAndClearParameters() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = stmt.unwrap(JdbcPreparedStatement2.class); + + stmt.setObject(1, 1); + stmt.setObject(3, 10L); + + assertEquals(Arrays.asList(1, null, 10L), ps.getArguments()); + + stmt.clearParameters(); + assertEquals(List.of(), ps.getArguments()); + + stmt.setObject(2, 1); + assertEquals(Arrays.asList(null, 1), ps.getArguments()); + + stmt.setObject(2, 2); + assertEquals(Arrays.asList(null, 2), ps.getArguments()); + + stmt.setObject(3, 4); + assertEquals(Arrays.asList(null, 2, 4), ps.getArguments()); + } + } + + @ParameterizedTest + @EnumSource(JDBCType.class) + public void setNull(JDBCType type) throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + int jdbcSqlType = type.getVendorTypeNumber(); + + if (SUPPORTED_TYPES.contains(type)) { + stmt.setNull(1, jdbcSqlType); + assertFalse(ps.getArguments().isEmpty()); + assertNull(ps.getArguments().get(0)); + + // Spec: If the parameter does not have a user-defined or REF type, the given typeName is ignored. + + stmt.setNull(2, jdbcSqlType, null); + assertFalse(ps.getArguments().isEmpty()); + assertNull(ps.getArguments().get(1)); + + stmt.setNull(2, jdbcSqlType, "TypeName"); + assertFalse(ps.getArguments().isEmpty()); + assertNull(ps.getArguments().get(1)); + + } else { + String error = "SQL-specific types are not supported."; + + expectError(() -> stmt.setNull(1, jdbcSqlType), error); + expectError(() -> stmt.setNull(1, jdbcSqlType, null), error); + expectError(() -> stmt.setNull(1, jdbcSqlType, "TypeName"), error); + } + } + } + + @Test + public void setBoolean() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setBoolean(1, true); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(Boolean.TRUE, ps.getArguments().get(0)); + } + } + + @Test + public void setByte() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setByte(1, (byte) 7); + assertFalse(ps.getArguments().isEmpty()); + assertEquals((byte) 7, ps.getArguments().get(0)); + } + } + + @Test + public void setShort() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setShort(1, (short) 123); + assertFalse(ps.getArguments().isEmpty()); + assertEquals((short) 123, ps.getArguments().get(0)); + } + } + + @Test + public void setInt() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setInt(1, 42); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(42, ps.getArguments().get(0)); + } + } + + @Test + public void setLong() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setLong(1, 1322L); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(1322L, ps.getArguments().get(0)); + } + } + + @Test + public void setFloat() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setFloat(1, 1.5f); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(1.5f, ps.getArguments().get(0)); + } + } + + @Test + public void setDouble() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setDouble(1, 2.75d); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(2.75d, ps.getArguments().get(0)); + } + } + + @Test + public void setDecimal() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + BigDecimal dec = new BigDecimal("1234.5678"); + stmt.setBigDecimal(1, dec); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(dec, ps.getArguments().get(0)); + + stmt.setBigDecimal(2, null); + assertTrue(ps.getArguments().size() >= 2); + assertNull(ps.getArguments().get(1)); + } + } + + @Test + public void setString() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setString(1, "hello"); + assertFalse(ps.getArguments().isEmpty()); + assertEquals("hello", ps.getArguments().get(0)); + + stmt.setString(2, null); + assertTrue(ps.getArguments().size() >= 2); + assertNull(ps.getArguments().get(1)); + } + } + + @Test + public void setNationalString() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + stmt.setNString(1, "Hello"); + assertFalse(ps.getArguments().isEmpty()); + assertEquals("Hello", ps.getArguments().get(0)); + + stmt.setNString(2, null); + assertTrue(ps.getArguments().size() >= 2); + assertNull(ps.getArguments().get(1)); + } + } + + @Test + public void setBytes() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + byte[] bytes = {1, 2, 3, 4}; + stmt.setBytes(1, bytes); + assertFalse(ps.getArguments().isEmpty()); + assertArrayEquals(bytes, (byte[]) ps.getArguments().get(0)); + + stmt.setBytes(2, null); + assertTrue(ps.getArguments().size() >= 2); + assertNull(ps.getArguments().get(1)); + } + } + + @Test + public void setDate() throws SQLException { + try (PreparedStatement stmt = createStatement()) { + JdbcPreparedStatement2 ps = (JdbcPreparedStatement2) stmt; + + LocalDate ld = LocalDate.of(2020, 1, 2); + stmt.setDate(1, Date.valueOf(ld)); + assertFalse(ps.getArguments().isEmpty()); + assertEquals(ld, ps.getArguments().get(0)); + + stmt.setDate(2, null); + assertTrue(ps.getArguments().size() >= 2); + assertNull(ps.getArguments().get(1)); + + stmt.setDate(3, Date.valueOf(ld), Calendar.getInstance()); + assertTrue(ps.getArguments().size() >= 3); + assertEquals(ld, ps.getArguments().get(2)); + Review Comment: Thanks. Fixed. ########## modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc2/JdbcStatement2.java: ########## @@ -50,16 +50,18 @@ */ public class JdbcStatement2 implements Statement { - private static final EnumSet<QueryModifier> QUERY = EnumSet.of(QueryModifier.ALLOW_ROW_SET_RESULT); + static final EnumSet<QueryModifier> QUERY = EnumSet.of(QueryModifier.ALLOW_ROW_SET_RESULT); - private static final EnumSet<QueryModifier> DML_OR_DDL = EnumSet.of( + static final EnumSet<QueryModifier> DML_OR_DDL = EnumSet.of( QueryModifier.ALLOW_AFFECTED_ROWS_RESULT, QueryModifier.ALLOW_APPLIED_RESULT); + static final EnumSet<QueryModifier> ALL = EnumSet.allOf(QueryModifier.class); Review Comment: Thanks. Fixed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
