Skip to content

chore: support spanner prefix jdbc url #3654

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

Merged
merged 4 commits into from
Feb 27, 2025
Merged

chore: support spanner prefix jdbc url #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb58f61
feat(spanner): support spanner prefix jdbc url
sagnghos Feb 21, 2025
958d908
support for both prefix spanner/cloudspanner
sagnghos Feb 21, 2025
b3615d2
unit test for change in existing pattern
sagnghos Feb 21, 2025
04a3e16
Merge branch 'main' into main
olavloite Feb 26, 2025
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 ...le-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,10 +640,10 @@ private Builder() {}

/** Spanner {@link ConnectionOptions} URI format. */
public static final String SPANNER_URI_FORMAT =
"(?:cloudspanner:)(?<HOSTGROUP>//[\\w.-]+(?:\\.[\\w\\.-]+)*[\\w\\-\\._~:/?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=.]+)?/projects/(?<PROJECTGROUP>(([a-z]|[-.:]|[0-9])+|(DEFAULT_PROJECT_ID)))(/instances/(?<INSTANCEGROUP>([a-z]|[-]|[0-9])+)(/databases/(?<DATABASEGROUP>([a-z]|[-]|[_]|[0-9])+))?)?(?:[?|;].*)?";
"(?:(?:spanner|cloudspanner):)(?<HOSTGROUP>//[\\w.-]+(?:\\.[\\w\\.-]+)*[\\w\\-\\._~:/?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=.]+)?/projects/(?<PROJECTGROUP>(([a-z]|[-.:]|[0-9])+|(DEFAULT_PROJECT_ID)))(/instances/(?<INSTANCEGROUP>([a-z]|[-]|[0-9])+)(/databases/(?<DATABASEGROUP>([a-z]|[-]|[_]|[0-9])+))?)?(?:[?|;].*)?";

public static final String EXTERNAL_HOST_FORMAT =
"(?:cloudspanner:)(?<HOSTGROUP>//[\\w.-]+(?::\\d+)?)(/instances/(?<INSTANCEGROUP>[a-z0-9-]+))?(/databases/(?<DATABASEGROUP>[a-z0-9_-]+))(?:[?;].*)?";
"(?:(?:spanner|cloudspanner):)(?<HOSTGROUP>//[\\w.-]+(?::\\d+)?)(/instances/(?<INSTANCEGROUP>[a-z0-9-]+))?(/databases/(?<DATABASEGROUP>[a-z0-9_-]+))(?:[?;].*)?";
private static final String SPANNER_URI_REGEX = "(?is)^" + SPANNER_URI_FORMAT + "$";

@VisibleForTesting
Expand Down
22 changes: 22 additions & 0 deletions ...loud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,5 +1247,27 @@ public void testExternalHostPatterns() {
Matcher matcherWithoutHost =
EXTERNAL_HOST_PATTERN.matcher("cloudspanner:/instances/default/databases/singers-db");
assertFalse(matcherWithoutHost.matches());
Matcher matcherWithPrefixSpanner =
EXTERNAL_HOST_PATTERN.matcher("spanner://localhost:15000/databases/test-db");
assertTrue(matcherWithPrefixSpanner.matches());
assertNull(matcherWithPrefixSpanner.group("INSTANCEGROUP"));
assertEquals("test-db", matcherWithPrefixSpanner.group("DATABASEGROUP"));
}

@Test
public void testBuildWithValidURIWithPrefixSpanner() {
ConnectionOptions.Builder builder = ConnectionOptions.newBuilder();
builder.setUri(
"spanner:/projects/test-project-123/instances/test-instance-123/databases/test-database-123?autocommit=false;readonly=true");
builder.setCredentialsUrl(FILE_TEST_PATH);
ConnectionOptions options = builder.build();
assertThat(options.getHost()).isEqualTo(DEFAULT_HOST);
assertThat(options.getProjectId()).isEqualTo("test-project-123");
assertThat(options.getInstanceId()).isEqualTo("test-instance-123");
assertThat(options.getDatabaseName()).isEqualTo("test-database-123");
assertThat(options.getCredentials())
.isEqualTo(new CredentialsService().createCredentials(FILE_TEST_PATH));
assertThat(options.isAutocommit()).isEqualTo(false);
assertThat(options.isReadOnly()).isEqualTo(true);
}
}
Loading