Merge branch 'main' into ssl-truststore-handling-2

Author: madhav-db

.github/workflows/checkNextChangelog.yml

@@ -0,0 +1,115 @@
+name: Check for NEXT_CHANGELOG.md Changes
+
+on:
+  pull_request_target:
+    branches: [ main ]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  check-next-changelog:
+    runs-on:
+      group: databricks-protected-runner-group
+      labels: linux-ubuntu-latest
+
+    steps:
+      - name: Checkout base branch (main)
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.base.ref }}
+          fetch-depth: 0
+
+      - name: Fetch list of changed files
+        id: changed-files
+        run: |
+          files=$(git diff --name-only HEAD^ HEAD || git diff --name-only origin/main HEAD)
+          echo "MODIFIED_FILES<<EOF" >> $GITHUB_ENV
+          echo "$files" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Verify NEXT_CHANGELOG.md was modified or PR message contains NO_CHANGELOG=true
+        id: verify-changelog
+        run: |
+          PR_BODY="${{ github.event.pull_request.body }}"
+          echo "PR body: $PR_BODY"
+          
+          if ! echo "$MODIFIED_FILES" | grep -q "NEXT_CHANGELOG.md"; then
+            if echo "$PR_BODY" | grep -q "NO_CHANGELOG=true"; then
+              echo "NO_CHANGELOG=true found in PR body."
+              echo "CHANGELOG_NEEDED=false" >> $GITHUB_ENV
+              exit 0
+            else
+              echo "ERROR: NEXT_CHANGELOG.md not modified and NO_CHANGELOG=true not present."
+              echo "CHANGELOG_NEEDED=true" >> $GITHUB_ENV
+              exit 1
+            fi
+          else
+            echo "✅ NEXT_CHANGELOG.md was updated."
+            echo "CHANGELOG_NEEDED=false" >> $GITHUB_ENV
+          fi
+
+      - name: Comment on PR with instructions if needed
+        if: failure() && env.CHANGELOG_NEEDED == 'true'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            const issue_number = context.issue.number;
+            
+            // Check if we've already commented
+            const comments = await github.rest.issues.listComments({
+              owner,
+              repo,
+              issue_number
+            });
+            
+            const existingComment = comments.data.find(comment => 
+              comment.body.includes('<!-- NEXT_CHANGELOG_INSTRUCTIONS -->')
+            );
+            
+            if (!existingComment) {
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number,
+                body: `<!-- NEXT_CHANGELOG_INSTRUCTIONS -->
+                Please ensure that the \`NEXT_CHANGELOG.md\` file is updated with any relevant changes.  
+                If this is not necessary for your PR, include this in the PR body:
+                
+                \`\`\`
+                NO_CHANGELOG=true
+                \`\`\`
+                
+                and rerun the workflow.`
+              });
+            }
+
+      - name: Delete instructions comment on success
+        if: success() && env.CHANGELOG_NEEDED == 'false'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            const issue_number = context.issue.number;
+            
+            const comments = await github.rest.issues.listComments({
+              owner,
+              repo,
+              issue_number
+            });
+            
+            const existingComments = comments.data.filter(comment => 
+              comment.body.includes('<!-- NEXT_CHANGELOG_INSTRUCTIONS -->')
+            );
+            
+            for (const comment of existingComments) {
+              await github.rest.issues.deleteComment({
+                owner,
+                repo,
+                comment_id: comment.id
+              });
+            }

CONTRIBUTING.md

@@ -61,7 +61,7 @@ Databricks JDBC Driver development, set up a GitHub account. Then:
   ```bash
   git add -A
 
-  git commit -m "Commit Message"
+  git commit -s -m "Commit Message"
   ```
 
 - Push your changes to your GitHub repo.
@@ -120,12 +120,21 @@ Note that when running the repository tests using maven or editor, logs will be
 
 - We generally follow this [Java Style Guide](https://google.github.io/styleguide/javaguide.html).
 
-## Sign Your Work
+## Developer Certificate of Origin
 
-The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the
-patch or otherwise have the right to pass it on as an open-source patch.
+To contribute to this repository, you must sign off your commits to certify that you have the right to contribute the
+code and that it complies with the open source license.
+
+You can easily do this by adding a "Signed-off-by" line to your commit message to certify your compliance. Please use
+your real name as pseudonymous/anonymous contributions are not accepted.
 
 ```
 Signed-off-by: Holly Smith <holly.smith@email.com>
 Use your real name (sorry, no pseudonyms or anonymous contributions.)
 ```
+
+If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with git commit -s:
+
+```
+git commit -s -m "Your commit message"
+```

DCO

@@ -0,0 +1,20 @@
+Developer's Certificate of Origin 1.1
+By making a contribution to this project, I certify that:
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.

NEXT_CHANGELOG.md

@@ -0,0 +1,15 @@
+# NEXT CHANGELOG
+
+## [Unreleased]
+
+### Added
+- Support for token cache in OAuth U2M Flow using the configuration parameters: `EnableTokenCache` and `TokenCachePassPhrase`.
+
+### Updated
+- 
+
+### Fixed
+- 
+
+---
+*Note: When making changes, please add your change under the appropriate section with a brief description.* 

NOTICE

@@ -1,4 +1,4 @@
-Copyright (2024) Databricks, Inc.
+Copyright (2025) Databricks, Inc.
 
 This Software includes software developed at Databricks (https://www.databricks.com/) and its use is subject to the included LICENSE file.
 
@@ -10,7 +10,7 @@ Copyright (2023) Databricks, Inc.
 Notice - https://github.com/databricks/databricks-sdk-java/blob/main/NOTICE
 
 apache/arrow - https://github.com/apache/arrow/tree/main
-Copyright 2016-2024 The Apache Software Foundation
+Copyright 2016-2025 The Apache Software Foundation
 Notice - https://github.com/apache/arrow/blob/main/NOTICE.txt
 
 diffplug/spotless - https://github.com/diffplug/spotless/tree/main
@@ -25,14 +25,14 @@ Copyright (C) 2006 - 2019, The Apache Software Foundation
 Notice - https://github.com/apache/thrift/blob/master/NOTICE
 
 apache/commons-io - https://github.com/apache/commons-io
-Copyright 2002-2024 The Apache Software Foundation
+Copyright 2002-2025 The Apache Software Foundation
 Notice - https://github.com/apache/commons-io/blob/master/NOTICE.txt
 
 google/guava - https://github.com/google/guava
 Copyright guava authors
 
 apache/logging-log4j2 - https://github.com/apache/logging-log4j2
-Copyright 1999-2024 Apache Software Foundation
+Copyright 1999-2025 Apache Software Foundation
 Notice - https://github.com/apache/logging-log4j2/blob/2.x/NOTICE.txt
 
 FasterXML/jackson-databind - https://github.com/FasterXML/jackson-databind
@@ -45,7 +45,7 @@ FasterXML/jackson-core - https://github.com/FasterXML/jackson-core
 Copyright jackson-core authors
 
 immutables/immutable - https://github.com/immutables/immutables
-Copyright 2013-2024 Immutables Authors and Contributors
+Copyright 2013-2025 Immutables Authors and Contributors
 
 lz4/lz4-java - https://github.com/lz4/lz4-java
 Copyright lz4-java authors
@@ -55,7 +55,7 @@ Copyright wiremock authors
 Notice - https://github.com/wiremock/wiremock/blob/master/NOTICE.txt
 
 apache/commons-fileupload - https://github.com/apache/commons-fileupload
-Copyright 2002-2024 The Apache Software Foundation
+Copyright 2002-2025 The Apache Software Foundation
 Notice - https://github.com/apache/commons-fileupload/blob/master/NOTICE.txt
 
 ________________

pom.xml

@@ -54,7 +54,7 @@
     <httpclient.version>4.5.14</httpclient.version>
     <commons-configuration.version>2.10.1</commons-configuration.version>
     <commons-io.version>2.14.0</commons-io.version>
-    <databricks-sdk.version>0.44.0</databricks-sdk.version>
+    <databricks-sdk.version>0.46.0</databricks-sdk.version>
     <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
     <sql-logic-test.version>0.3</sql-logic-test.version>
     <lz4-compression.version>1.8.0</lz4-compression.version>

src/main/java/com/databricks/jdbc/api/impl/DatabricksArray.java

@@ -1,8 +1,11 @@
 package com.databricks.jdbc.api.impl;
 
 import com.databricks.jdbc.common.util.DatabricksTypeUtil;
+import com.databricks.jdbc.exception.DatabricksDriverException;
+import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;
 import com.databricks.jdbc.log.JdbcLogger;
 import com.databricks.jdbc.log.JdbcLoggerFactory;
+import com.databricks.jdbc.model.telemetry.enums.DatabricksDriverErrorCode;
 import java.math.BigDecimal;
 import java.sql.Array;
 import java.sql.Date;
@@ -77,8 +80,13 @@ private Object[] convertElements(List<Object> elements, String elementType) {
           convertedElements[i] = convertValue(element, elementType);
         }
       } catch (Exception e) {
-        LOGGER.error("Error converting element at index {}: {}", i, e.getMessage(), e);
-        throw new IllegalArgumentException("Error converting elements", e);
+        String errorMessage =
+            String.format("Error converting element at index %s: %s", i, e.getMessage());
+        LOGGER.error(errorMessage, e);
+        throw new DatabricksDriverException(
+            "Error converting elements",
+            e,
+            DatabricksDriverErrorCode.COMPLEX_DATA_TYPE_ARRAY_CONVERSION_ERROR);
       }
     }
     return convertedElements;
@@ -126,9 +134,11 @@ private Object convertValue(Object value, String type) {
           return value.toString();
       }
     } catch (Exception e) {
-      LOGGER.error("Error converting simple value of type {}: {}", type, e.getMessage(), e);
-      throw new IllegalArgumentException(
-          "Failed to convert value " + value + " to type " + type, e);
+      String errorMessage =
+          String.format("Error converting simple value of type %s: %s", type, e.getMessage());
+      LOGGER.error(String.format("%s, value : %s", errorMessage, value), e);
+      throw new DatabricksDriverException(
+          errorMessage, DatabricksDriverErrorCode.COMPLEX_DATA_TYPE_ARRAY_CONVERSION_ERROR);
     }
   }
 
@@ -176,27 +186,28 @@ public void free() throws SQLException {
   @Override
   public java.sql.ResultSet getResultSet() throws SQLException {
     LOGGER.error("getResultSet() not implemented");
-    throw new UnsupportedOperationException("getResultSet() not implemented");
+    throw new DatabricksSQLFeatureNotSupportedException("getResultSet() not implemented");
   }
 
   @Override
   public java.sql.ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException {
     LOGGER.error("getResultSet(Map<String, Class<?>> map) not implemented");
-    throw new UnsupportedOperationException(
+    throw new DatabricksSQLFeatureNotSupportedException(
         "getResultSet(Map<String, Class<?>> map) not implemented");
   }
 
   @Override
   public java.sql.ResultSet getResultSet(long index, int count) throws SQLException {
     LOGGER.error("getResultSet(long index, int count) not implemented");
-    throw new UnsupportedOperationException("getResultSet(long index, int count) not implemented");
+    throw new DatabricksSQLFeatureNotSupportedException(
+        "getResultSet(long index, int count) not implemented");
   }
 
   @Override
   public java.sql.ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
       throws SQLException {
     LOGGER.error("getResultSet(long index, int count, Map<String, Class<?>> map) not implemented");
-    throw new UnsupportedOperationException(
+    throw new DatabricksSQLFeatureNotSupportedException(
         "getResultSet(long index, int count, Map<String, Class<?>> map) not implemented");
   }
 

src/main/java/com/databricks/jdbc/api/impl/DatabricksConnectionContext.java

@@ -12,6 +12,7 @@
 import com.databricks.jdbc.common.util.WildcardUtil;
 import com.databricks.jdbc.exception.DatabricksParsingException;
 import com.databricks.jdbc.exception.DatabricksSQLException;
+import com.databricks.jdbc.exception.DatabricksValidationException;
 import com.databricks.jdbc.log.JdbcLogger;
 import com.databricks.jdbc.log.JdbcLoggerFactory;
 import com.databricks.jdbc.model.telemetry.enums.DatabricksDriverErrorCode;
@@ -153,7 +154,7 @@ public static IDatabricksConnectionContext parse(String url, Properties properti
       return new DatabricksConnectionContext(url, hostValue, portValue, schema, propertiesMap);
     } else {
       // Should never reach here, since we have already checked for url validity
-      throw new IllegalArgumentException("Invalid url " + "incorrect");
+      throw new DatabricksValidationException("Connection Context invalid state error");
     }
   }
 
@@ -849,6 +850,16 @@ public int getSocketTimeout() {
     return Integer.parseInt(getParameter(DatabricksJdbcUrlParams.SOCKET_TIMEOUT));
   }
 
+  @Override
+  public String getTokenCachePassPhrase() {
+    return getParameter(DatabricksJdbcUrlParams.TOKEN_CACHE_PASS_PHRASE);
+  }
+
+  @Override
+  public boolean isTokenCacheEnabled() {
+    return getParameter(DatabricksJdbcUrlParams.ENABLE_TOKEN_CACHE).equals("1");
+  }
+
   private static boolean nullOrEmptyString(String s) {
     return s == null || s.isEmpty();
   }