SNOW-1636286: Add exact search for schema

snowflakedb · Dec 19, 2024 · aa61f94 · aa61f94
1 parent b3a2763
commit aa61f94
Show file tree

Hide file tree

Showing 6 changed files with 265 additions and 64 deletions.
diff --git a/src/main/java/net/snowflake/client/core/SFBaseSession.java b/src/main/java/net/snowflake/client/core/SFBaseSession.java
@@ -139,6 +139,11 @@ public abstract class SFBaseSession {
   // we need to allow for it to maintain backwards compatibility.
   private boolean enablePatternSearch = true;
 
+  // Enables the use of exact schema searches for certain DatabaseMetaData methods
+  // that should use schema from context (CLIENT_METADATA_REQUEST_USE_CONNECTION_CTX=true)
+  // value is false for backwards compatibility.
+  private boolean enableExactSchemaSearch = false;
+
   /** Disable lookup for default credentials by GCS library */
   private boolean disableGcsDefaultCredentials = false;
 
@@ -1069,6 +1074,14 @@ public void setEnablePatternSearch(boolean enablePatternSearch) {
     this.enablePatternSearch = enablePatternSearch;
   }
 
+  public boolean getEnableExactSchemaSearch() {
+    return enableExactSchemaSearch;
+  }
+
+  void setEnableExactSchemaSearch(boolean enableExactSchemaSearch) {
+    this.enableExactSchemaSearch = enableExactSchemaSearch;
+  }
+
   public boolean getDisableGcsDefaultCredentials() {
     return disableGcsDefaultCredentials;
   }

diff --git a/src/main/java/net/snowflake/client/core/SFSession.java b/src/main/java/net/snowflake/client/core/SFSession.java
@@ -509,6 +509,13 @@ public void addSFSessionProperty(String propertyName, Object propertyValue) thro
             setEnablePatternSearch(getBooleanValue(propertyValue));
           }
           break;
+
+        case ENABLE_EXACT_SCHEMA_SEARCH_ENABLED:
+          if (propertyValue != null) {
+            setEnableExactSchemaSearch(getBooleanValue(propertyValue));
+          }
+          break;
+
         case DISABLE_GCS_DEFAULT_CREDENTIALS:
           if (propertyValue != null) {
             setDisableGcsDefaultCredentials(getBooleanValue(propertyValue));

diff --git a/src/main/java/net/snowflake/client/core/SFSessionProperty.java b/src/main/java/net/snowflake/client/core/SFSessionProperty.java
@@ -89,6 +89,7 @@ public enum SFSessionProperty {
   DIAGNOSTICS_ALLOWLIST_FILE("DIAGNOSTICS_ALLOWLIST_FILE", false, String.class),
 
   ENABLE_PATTERN_SEARCH("enablePatternSearch", false, Boolean.class),
+  ENABLE_EXACT_SCHEMA_SEARCH_ENABLED("ENABLE_EXACT_SCHEMA_SEARCH_ENABLED", false, Boolean.class),
 
   DISABLE_GCS_DEFAULT_CREDENTIALS("disableGcsDefaultCredentials", false, Boolean.class),