Skip to content

Commit e2d68e0

Browse files
committed
test(flight-sql-jdbc): cover ResultSet metadata nullability (GH-782)
1 parent dbcaa3c commit e2d68e0

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ public void testReturnColumnNullability() throws SQLException {
272272
try (final PreparedStatement psmt = connection.prepareStatement(query)) {
273273
assertAll(
274274
"Column nullability is as expected",
275-
() -> assertThat("nullable", equalTo(psmt.getMetaData().getColumnName(1))),
276-
() -> assertThat("required", equalTo(psmt.getMetaData().getColumnName(2))),
275+
() -> assertThat(psmt.getMetaData().getColumnName(1), equalTo("nullable")),
276+
() -> assertThat(psmt.getMetaData().getColumnName(2), equalTo("required")),
277277
() ->
278278
assertThat(
279279
psmt.getMetaData().isNullable(1), equalTo(ResultSetMetaData.columnNullable)),

‎flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.sql.Connection;
2727
import java.sql.ResultSet;
28+
import java.sql.ResultSetMetaData;
2829
import java.sql.SQLException;
2930
import java.sql.Statement;
3031
import java.util.Collections;
@@ -153,6 +154,8 @@ public void testExecuteShouldRunSelectQuery() throws SQLException {
153154
try (final ResultSet resultSet = statement.getResultSet()) {
154155
final int columnCount = resultSet.getMetaData().getColumnCount();
155156
assertThat(columnCount, is(1));
157+
assertThat(
158+
resultSet.getMetaData().isNullable(1), equalTo(ResultSetMetaData.columnNullable));
156159
int rowCount = 0;
157160
for (; resultSet.next(); rowCount++) {
158161
assertThat(numbers.remove(resultSet.getByte(1)), is(true));

‎flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetMetadataTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,13 @@ public void testShouldGetTableName() throws SQLException {
184184
assertThat(metadata.getTableName(3), equalTo("TABLE_NAME_3"));
185185
}
186186

187+
@Test
188+
public void testShouldIsNullable() throws SQLException {
189+
assertThat(metadata.isNullable(1), equalTo(ResultSetMetaData.columnNullable));
190+
assertThat(metadata.isNullable(2), equalTo(ResultSetMetaData.columnNullable));
191+
assertThat(metadata.isNullable(3), equalTo(ResultSetMetaData.columnNoNulls));
192+
}
193+
187194
@Test
188195
public void testShouldIsAutoIncrement() throws SQLException {
189196
assertThat(metadata.isAutoIncrement(1), equalTo(true));

‎flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
7474
new Field(
7575
"col2",
7676
new FieldType(
77-
true,
77+
false,
7878
ArrowType.Utf8View.INSTANCE,
7979
null,
8080
new FlightSqlColumnMetadata.Builder()
@@ -106,7 +106,7 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
106106
.setSchemaName("schema1")
107107
.setTableName("table1")
108108
.setColumnName("col2")
109-
.setNullable(ResultSetMetaData.columnNullable)
109+
.setNullable(ResultSetMetaData.columnNoNulls)
110110
.setType(
111111
Common.AvaticaType.newBuilder()
112112
.setId(SqlTypes.getSqlTypeIdFromArrowType(ArrowType.Utf8View.INSTANCE))

‎flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ private static void addLegacyMetadataSqlCmdSupport(final MockFlightSqlProducer p
367367
new Field(
368368
"float2",
369369
new FieldType(
370-
true,
370+
false,
371371
new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE),
372372
null,
373373
new FlightSqlColumnMetadata.Builder()

0 commit comments

Comments
 (0)