Skip to content

Commit f6235a9

Browse files
committed
Remove inlineConnection (EnableArrow=0) from DataTypesIntegrationTests
EnableArrow=0 is now deprecated and ignored — the driver always uses Arrow. The inlineConnection created WireMock requests with JSON_ARRAY format that no longer match, causing NPE on null ResultSet. Remove the dual-path testing since there is only one code path now. Co-authored-by: Isaac Signed-off-by: Gopal Lal <gopal.lal@databricks.com>
1 parent 8870af7 commit f6235a9

1 file changed

Lines changed: 0 additions & 18 deletions

File tree

src/test/java/com/databricks/jdbc/integration/fakeservice/tests/DataTypesIntegrationTests.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.databricks.jdbc.integration.fakeservice.AbstractFakeServiceIntegrationTests;
99
import com.databricks.jdbc.integration.fakeservice.FakeServiceExtension;
1010
import java.sql.*;
11-
import java.util.Properties;
1211
import java.util.stream.Stream;
1312
import org.junit.jupiter.api.AfterEach;
1413
import org.junit.jupiter.api.Assumptions;
@@ -22,7 +21,6 @@
2221
public class DataTypesIntegrationTests extends AbstractFakeServiceIntegrationTests {
2322

2423
private Connection connection;
25-
private Connection inlineConnection;
2624

2725
private static final String LEADING_TRAILING_SPACES = " leading and trailing spaces ";
2826
private static final String UNICODE_TEXT = "こんにちは";
@@ -32,15 +30,11 @@ public class DataTypesIntegrationTests extends AbstractFakeServiceIntegrationTes
3230
@BeforeEach
3331
void setUp() throws SQLException {
3432
connection = getValidJDBCConnection();
35-
Properties properties = new Properties();
36-
properties.setProperty("enableArrow", "0");
37-
inlineConnection = getValidJDBCConnection(properties);
3833
}
3934

4035
@AfterEach
4136
void cleanUp() throws SQLException {
4237
closeConnection(connection);
43-
closeConnection(inlineConnection);
4438
}
4539

4640
@Test
@@ -63,28 +57,18 @@ void testStringEdgeCases() throws SQLException {
6357
+ ") AS string_edge_cases(id, test_string) "
6458
+ "ORDER BY id";
6559
ResultSet resultSet = executeQuery(connection, query);
66-
ResultSet inlineResultSet = executeQuery(inlineConnection, query);
67-
6860
validateStringResults(resultSet);
69-
validateStringResults(inlineResultSet);
70-
7161
resultSet.close();
72-
inlineResultSet.close();
7362
}
7463

7564
@ParameterizedTest
7665
@MethodSource("nullHandlingProvider")
7766
void testNullHandling(String query, int expectedType) throws SQLException {
7867
ResultSet resultSet = executeQuery(connection, query);
79-
ResultSet inlineResultSet = executeQuery(inlineConnection, query);
8068
assertTrue(resultSet.next());
81-
assertTrue(inlineResultSet.next());
8269
assertNull(resultSet.getObject(1));
83-
assertNull(inlineResultSet.getObject(1));
8470
assertEquals(expectedType, resultSet.getMetaData().getColumnType(1));
85-
assertEquals(expectedType, inlineResultSet.getMetaData().getColumnType(1));
8671
resultSet.close();
87-
inlineResultSet.close();
8872
}
8973

9074
private static Stream<Arguments> nullHandlingProvider() {
@@ -235,9 +219,7 @@ void testTimestamp() throws SQLException {
235219

236220
String query = "SELECT id, ts FROM " + getFullyQualifiedTableName(tableName) + " ORDER BY id";
237221
ResultSet resultSet = executeQuery(connection, query);
238-
ResultSet inlineResultSet = executeQuery(inlineConnection, query);
239222
validateTimestampResults(resultSet);
240-
validateTimestampResults(inlineResultSet);
241223

242224
deleteTable(connection, tableName);
243225
resultSet.close();

0 commit comments

Comments
 (0)