Skip to content

Commit cec6d6c

Browse files
sfc-gh-pmotackisfc-gh-pmotacki
committed
1 parent 208f5ac commit cec6d6c

File tree

2 files changed

+51
-33
lines changed

2 files changed

+51
-33
lines changed

‎src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,13 @@ public void testGetFunctionColumns() throws SQLException {
177177
databaseMetaData.getMaxCharLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
178178
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
179179
assertEquals("", resultSet.getString("IS_NULLABLE"));
180-
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
181-
resultSet
182-
.getString("SPECIFIC_NAME")
183-
.replaceAll("\\s", "")
184-
.matches(
185-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
180+
assertThat(
181+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
182+
resultSet
183+
.getString("SPECIFIC_NAME")
184+
.replaceAll("\\s", "")
185+
.matches(
186+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
186187
resultSet.next();
187188
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
188189
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -200,12 +201,13 @@ public void testGetFunctionColumns() throws SQLException {
200201
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
201202
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
202203
assertEquals("", resultSet.getString("IS_NULLABLE"));
203-
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
204-
resultSet
205-
.getString("SPECIFIC_NAME")
206-
.replaceAll("\\s", "")
207-
.matches(
208-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
204+
assertThat(
205+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
206+
resultSet
207+
.getString("SPECIFIC_NAME")
208+
.replaceAll("\\s", "")
209+
.matches(
210+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
209211
resultSet.next();
210212
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
211213
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -224,12 +226,13 @@ public void testGetFunctionColumns() throws SQLException {
224226
databaseMetaData.getMaxBinaryLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
225227
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
226228
assertEquals("", resultSet.getString("IS_NULLABLE"));
227-
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
228-
resultSet
229-
.getString("SPECIFIC_NAME")
230-
.replaceAll("\\s", "")
231-
.matches(
232-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
229+
assertThat(
230+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
231+
resultSet
232+
.getString("SPECIFIC_NAME")
233+
.replaceAll("\\s", "")
234+
.matches(
235+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
233236
resultSet.next();
234237
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
235238
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -247,7 +250,8 @@ public void testGetFunctionColumns() throws SQLException {
247250
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
248251
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
249252
assertEquals("", resultSet.getString("IS_NULLABLE"));
250-
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
253+
assertThat(
254+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
251255
resultSet
252256
.getString("SPECIFIC_NAME")
253257
.replaceAll("\\s", "")

‎src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -889,13 +889,16 @@ public void testGetFunctionColumns() throws Exception {
889889
assertEquals(DatabaseMetaData.functionNullableUnknown, resultSet.getInt("NULLABLE"));
890890
assertEquals("returns table of 4 columns", resultSet.getString("REMARKS"));
891891
// char octet length column is not supported and always returns 0
892-
assertEquals(EXPECTED_MAX_CHAR_LENGTH, resultSet.getInt("CHAR_OCTET_LENGTH"));
893892
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
894893
// is_nullable column is not supported and always returns empty string
895894
assertEquals("", resultSet.getString("IS_NULLABLE"));
896-
assertEquals(
897-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
898-
resultSet.getString("SPECIFIC_NAME"));
895+
assertThat(
896+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
897+
resultSet
898+
.getString("SPECIFIC_NAME")
899+
.replaceAll("\\s", "")
900+
.matches(
901+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
899902
resultSet.next();
900903
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
901904
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -918,9 +921,13 @@ public void testGetFunctionColumns() throws Exception {
918921
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
919922
// is_nullable column is not supported and always returns empty string
920923
assertEquals("", resultSet.getString("IS_NULLABLE"));
921-
assertEquals(
922-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
923-
resultSet.getString("SPECIFIC_NAME"));
924+
assertThat(
925+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
926+
resultSet
927+
.getString("SPECIFIC_NAME")
928+
.replaceAll("\\s", "")
929+
.matches(
930+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
924931
resultSet.next();
925932
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
926933
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -939,13 +946,16 @@ public void testGetFunctionColumns() throws Exception {
939946
assertEquals(DatabaseMetaData.functionNullableUnknown, resultSet.getInt("NULLABLE"));
940947
assertEquals("returns table of 4 columns", resultSet.getString("REMARKS"));
941948
// char octet length column is not supported and always returns 0
942-
assertEquals(EXPECTED_MAX_BINARY_LENGTH, resultSet.getInt("CHAR_OCTET_LENGTH"));
943949
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
944950
// is_nullable column is not supported and always returns empty string
945951
assertEquals("", resultSet.getString("IS_NULLABLE"));
946-
assertEquals(
947-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
948-
resultSet.getString("SPECIFIC_NAME"));
952+
assertThat(
953+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
954+
resultSet
955+
.getString("SPECIFIC_NAME")
956+
.replaceAll("\\s", "")
957+
.matches(
958+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
949959
resultSet.next();
950960
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
951961
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -968,9 +978,13 @@ public void testGetFunctionColumns() throws Exception {
968978
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
969979
// is_nullable column is not supported and always returns empty string
970980
assertEquals("", resultSet.getString("IS_NULLABLE"));
971-
assertEquals(
972-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
973-
resultSet.getString("SPECIFIC_NAME"));
981+
assertThat(
982+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
983+
resultSet
984+
.getString("SPECIFIC_NAME")
985+
.replaceAll("\\s", "")
986+
.matches(
987+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
974988
assertFalse(resultSet.next());
975989
}
976990

0 commit comments

Comments
 (0)