Skip to content

Commit 8e4b350

Browse files
SNOW-1960848 - fix tests after MaxLobSize changes
1 parent 90c82b8 commit 8e4b350

1 file changed

Lines changed: 25 additions & 12 deletions

File tree

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static net.snowflake.client.jdbc.DatabaseMetaDataInternalIT.initMetaData;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertFalse;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
78

89
import java.sql.Connection;
910
import java.sql.DatabaseMetaData;
@@ -176,9 +177,12 @@ public void testGetFunctionColumns() throws SQLException {
176177
databaseMetaData.getMaxCharLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
177178
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
178179
assertEquals("", resultSet.getString("IS_NULLABLE"));
179-
assertEquals(
180-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
181-
resultSet.getString("SPECIFIC_NAME"));
180+
assertTrue(
181+
resultSet
182+
.getString("SPECIFIC_NAME")
183+
.replaceAll("\\s", "")
184+
.matches(
185+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
182186
resultSet.next();
183187
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
184188
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -196,9 +200,12 @@ public void testGetFunctionColumns() throws SQLException {
196200
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
197201
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
198202
assertEquals("", resultSet.getString("IS_NULLABLE"));
199-
assertEquals(
200-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
201-
resultSet.getString("SPECIFIC_NAME"));
203+
assertTrue(
204+
resultSet
205+
.getString("SPECIFIC_NAME")
206+
.replaceAll("\\s", "")
207+
.matches(
208+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
202209
resultSet.next();
203210
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
204211
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -217,9 +224,12 @@ public void testGetFunctionColumns() throws SQLException {
217224
databaseMetaData.getMaxBinaryLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
218225
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
219226
assertEquals("", resultSet.getString("IS_NULLABLE"));
220-
assertEquals(
221-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
222-
resultSet.getString("SPECIFIC_NAME"));
227+
assertTrue(
228+
resultSet
229+
.getString("SPECIFIC_NAME")
230+
.replaceAll("\\s", "")
231+
.matches(
232+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
223233
resultSet.next();
224234
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
225235
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -237,9 +247,12 @@ public void testGetFunctionColumns() throws SQLException {
237247
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
238248
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
239249
assertEquals("", resultSet.getString("IS_NULLABLE"));
240-
assertEquals(
241-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
242-
resultSet.getString("SPECIFIC_NAME"));
250+
assertTrue(
251+
resultSet
252+
.getString("SPECIFIC_NAME")
253+
.replaceAll("\\s", "")
254+
.matches(
255+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
243256
// setting catalog to % will result in 0 columns. % does not apply for catalog, only for
244257
// other
245258
// params

0 commit comments

Comments
 (0)