Skip to content

[Fix] Make userAgent compatible with SQL Drivers #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

[Fix] Make userAgent compatible with SQL Drivers #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e6f991
Make userAgent compatible with SQL Drivers
samikshya-db Oct 11, 2024
624a321
Merge branch 'main' into samikshya-db/regexUserAgent
samikshya-db Oct 11, 2024
fc3d0dc
Merge branch 'main' into samikshya-db/regexUserAgent
hectorcast-db Oct 18, 2024
2d5e843
Merge branch 'main' into samikshya-db/regexUserAgent
samikshya-db Nov 18, 2024
ec20320
modify sanitise inverse pattern
samikshya-db Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public static void withProduct(String product, String productVersion) {
private static final Pattern regexpSemVer =
Pattern.compile("^" + semVerCore + semVerPrerelease + semVerBuildmetadata + "$");

private static final Pattern regexpAlphanum = Pattern.compile("^[0-9A-Za-z_\\.\\+-]+$");
private static final Pattern regexpAlphanumInverse = Pattern.compile("[^0-9A-Za-z_\\.\\+-]");
private static final Pattern regexpAlphanum = Pattern.compile("^[0-9A-Za-z_\\.\\+\\-/ ]+$");
private static final Pattern regexpAlphanumInverse = Pattern.compile("[^0-9A-Za-z_\\.\\+\\-/ ]");

/**
* Replaces all non-alphanumeric characters with a hyphen. Use this to ensure that the user agent
Expand Down
7 changes: 7 additions & 0 deletions databricks-sdk-java/src/test/java/com/databricks/sdk/core/UserAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,11 @@ public void testUserAgentWithSemverValue() {
String userAgent = UserAgent.asString();
Assertions.assertTrue(userAgent.contains("key1/1.0.0-dev+metadata"));
}

@Test
public void testUserAgentWithSQLDriverUserAgent() {
UserAgent.withOtherInfo("Java", "SQLExecHttpClient/HC TEST/42.2.0.2712019");
String userAgent = UserAgent.asString();
Assertions.assertTrue(userAgent.contains("Java/SQLExecHttpClient/HC TEST/42.2.0.2712019"));
}
}
Loading