SNOW-1308317 SNOW-1432770 Update DatabaseMetaDataInternalIT testGetTa…

…bles to work with adding account_usage_snowhouse_local_setup_import.sql to make setup (#1760)
snowflakedb · May 20, 2024 · 23db457 · 23db457
1 parent c601137
commit 23db457
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java b/src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalIT.java
@@ -476,15 +476,25 @@ public void testGetTables() throws SQLException {
         assertEquals(0, getSizeOfResultSet(resultSet));
       }
 
+      // Get the count of tables in the SNOWFLAKE system database, so we can exclude them from
+      // subsequent assertions
+      int numSnowflakeTables = 0;
+      try (ResultSet snowflakeResultSet =
+          databaseMetaData.getTables("SNOWFLAKE", null, null, null)) {
+        numSnowflakeTables = getSizeOfResultSet(snowflakeResultSet);
+      }
+
       try (ResultSet resultSet = databaseMetaData.getTables(null, null, null, null)) {
         assertEquals(
-            getAllObjectCountInDBViaInforSchema(getAllTable), getSizeOfResultSet(resultSet));
+            getAllObjectCountInDBViaInforSchema(getAllTable),
+            getSizeOfResultSet(resultSet) - numSnowflakeTables);
       }
 
       try (ResultSet resultSet =
           databaseMetaData.getTables(null, null, null, new String[] {"VIEW", "SYSTEM_TABLE"})) {
         assertEquals(
-            getAllObjectCountInDBViaInforSchema(getAllView), getSizeOfResultSet(resultSet));
+            getAllObjectCountInDBViaInforSchema(getAllView),
+            getSizeOfResultSet(resultSet) - numSnowflakeTables);
       }
 
       try (ResultSet resultSet =
@@ -497,13 +507,15 @@ public void testGetTables() throws SQLException {
           databaseMetaData.getTables(
               null, null, null, new String[] {"TABLE", "VIEW", "SYSTEM_TABLE"})) {
         assertEquals(
-            getAllObjectCountInDBViaInforSchema(getAllTable), getSizeOfResultSet(resultSet));
+            getAllObjectCountInDBViaInforSchema(getAllTable),
+            getSizeOfResultSet(resultSet) - numSnowflakeTables);
       }
 
       try (ResultSet resultSet =
           databaseMetaData.getTables(null, null, null, new String[] {"TABLE", "VIEW"})) {
         assertEquals(
-            getAllObjectCountInDBViaInforSchema(getAllTable), getSizeOfResultSet(resultSet));
+            getAllObjectCountInDBViaInforSchema(getAllTable),
+            getSizeOfResultSet(resultSet) - numSnowflakeTables);
       }
 
       try (ResultSet resultSet =
@@ -515,7 +527,8 @@ public void testGetTables() throws SQLException {
       try (ResultSet resultSet =
           databaseMetaData.getTables(null, null, null, new String[] {"VIEW"})) {
         assertEquals(
-            getAllObjectCountInDBViaInforSchema(getAllView), getSizeOfResultSet(resultSet));
+            getAllObjectCountInDBViaInforSchema(getAllView),
+            getSizeOfResultSet(resultSet) - numSnowflakeTables);
       }
 
       try (ResultSet resultSet =