danepitkin commented on code in PR #39188:
URL: https://github.com/apache/arrow/pull/39188#discussion_r1423209546
##########
java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml:
##########
@@ -13,59 +13,59 @@ name: 'test1_all_datatypes_h2'
create: 'CREATE TABLE table1 (int_field1 INT, bool_field2 BOOLEAN,
tinyint_field3 TINYINT, smallint_field4 SMALLINT, bigint_field5 BIGINT,
decimal_field6 DECIMAL(20,2), double_field7 DOUBLE, real_field8 REAL,
time_field9 TIME, date_field10 DATE, timestamp_field11 TIMESTAMP,
- binary_field12 BINARY(100), varchar_field13 VARCHAR(256), blob_field14
BLOB, clob_field15 CLOB, char_field16 CHAR(16), bit_field17 BIT,
- null_field18 NULL, list_field19 ARRAY, map_field20 VARCHAR(256));'
+ binary_field12 VARBINARY(100), varchar_field13 VARCHAR(256), blob_field14
BLOB, clob_field15 CLOB, char_field16 CHAR(14), bit_field17 BIT,
+ null_field18 NULL, list_field19 INT ARRAY, map_field20 VARCHAR(256));'
data:
- 'INSERT INTO table1 VALUES (101, 1, 45, 12000, 92233720, 17345667789.23,
56478356785.345, 56478356785.345, PARSEDATETIME(''12:45:35 GMT'', ''HH:mm:ss
z''),
PARSEDATETIME(''2018-02-12 GMT'', ''yyyy-MM-dd z''),
PARSEDATETIME(''2018-02-12 12:45:35 GMT'', ''yyyy-MM-dd HH:mm:ss z''),
''736f6d6520746578742074686174206e6565647320746f20626520636f6e76657274656420746f2062696e617279'',
''some text that needs to be converted to varchar'',
-
''736f6d6520746578742074686174206e6565647320746f20626520636f6e76657274656420746f2062696e617279'',
''some text that needs to be converted to clob'', ''some char text'', 1, null,
(1, 2, 3), ''{"a":"b","key":"12345"}'');'
+
''736f6d6520746578742074686174206e6565647320746f20626520636f6e76657274656420746f2062696e617279'',
''some text that needs to be converted to clob'', ''some char text'', 1, null,
ARRAY[1, 2, 3], ''{"a":"b","key":"12345"}'');'
Review Comment:
Array literal grammar: https://www.h2database.com/html/grammar.html#array
##########
java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java:
##########
@@ -53,7 +53,8 @@ public class JdbcToArrowArrayTest {
private Connection conn = null;
private static final String CREATE_STATEMENT =
- "CREATE TABLE array_table (id INTEGER, int_array ARRAY, float_array
ARRAY, string_array ARRAY);";
+ "CREATE TABLE array_table (id INTEGER, int_array INTEGER ARRAY,
float_array REAL ARRAY, " +
Review Comment:
Arrays must be typed:
https://www.h2database.com/html/migration-to-v2.html?highlight=migration&search=migration#firstFound
##########
java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java:
##########
@@ -205,7 +205,7 @@ private String getTableComment(DatabaseMetaData metaData,
String tableName) thro
}
String comment = null;
int rowCount = 0;
- try (ResultSet tableMetadata = metaData.getTables("%", "%", tableName,
null)) {
+ try (ResultSet tableMetadata = metaData.getTables(null, null, tableName,
null)) {
Review Comment:
getTables API:
https://www.h2database.com/javadoc/org/h2/jdbc/JdbcDatabaseMetaData.html#getTables-java.lang.String-java.lang.String-java.lang.String-java.lang.String:A-
##########
java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java:
##########
@@ -127,7 +127,7 @@ public void schemaCommentWithDatabaseMetadata() throws
Exception {
"SQL_SCHEMA_NAME", "PUBLIC",
"SQL_TABLE_NAME", "TABLE1",
"SQL_COLUMN_NAME", "NAME",
- "SQL_TYPE", "VARCHAR",
+ "SQL_TYPE", "CHARACTER VARYING",
Review Comment:
H2 VarChar string description:
https://github.com/h2database/h2database/blob/1f1ad768b527ce929557c0b0784cb214808811f9/h2/src/main/org/h2/api/H2Type.java#L29
##########
java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java:
##########
@@ -429,7 +419,7 @@ public static byte[][] getBinaryValues(String[] values,
String dataType) {
byte[][] valueArr = new byte[dataArr.length][];
int i = 0;
for (String data : dataArr) {
- valueArr[i++] = "null".equals(data.trim()) ? null :
hexStringToByteArray(data.trim());
+ valueArr[i++] = "null".equals(data.trim()) ? null :
data.trim().getBytes();
Review Comment:
Binary/VarBinary/Blob now converted to byte[]:
https://www.h2database.com/html/datatypes.html?highlight=datatype&search=datatype#binary_type
##########
java/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml:
##########
@@ -13,59 +13,59 @@ name: 'test1_all_datatypes_h2'
create: 'CREATE TABLE table1 (int_field1 INT, bool_field2 BOOLEAN,
tinyint_field3 TINYINT, smallint_field4 SMALLINT, bigint_field5 BIGINT,
decimal_field6 DECIMAL(20,2), double_field7 DOUBLE, real_field8 REAL,
time_field9 TIME, date_field10 DATE, timestamp_field11 TIMESTAMP,
- binary_field12 BINARY(100), varchar_field13 VARCHAR(256), blob_field14
BLOB, clob_field15 CLOB, char_field16 CHAR(16), bit_field17 BIT,
- null_field18 NULL, list_field19 ARRAY, map_field20 VARCHAR(256));'
+ binary_field12 VARBINARY(100), varchar_field13 VARCHAR(256), blob_field14
BLOB, clob_field15 CLOB, char_field16 CHAR(14), bit_field17 BIT,
Review Comment:
VarBinary is a new type that will read valid data only. Binary is now fixed
length.
https://www.h2database.com/html/migration-to-v2.html?highlight=migration&search=migration#firstFound
##########
java/adapter/jdbc/src/test/resources/h2/test1_char_h2.yml:
##########
@@ -15,7 +15,7 @@ type: 'char'
vector: 'CHAR_FIELD16'
-create: 'CREATE TABLE table1 (char_field16 CHAR(16));'
+create: 'CREATE TABLE table1 (char_field16 CHAR(14));'
Review Comment:
Char is fixed length now:
https://www.h2database.com/html/datatypes.html?highlight=literal&search=literal#character_type
--
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]
