feat: support spanner prefix jdbc url

Author: sagnghos

src/main/java/com/google/cloud/spanner/jdbc/JdbcDriver.java

@@ -216,7 +216,7 @@ public JdbcDriver() {}
 
   @Override
   public Connection connect(String url, Properties info) throws SQLException {
-    if (url != null && url.startsWith("jdbc:cloudspanner")) {
+    if (url != null && (url.startsWith("jdbc:cloudspanner") || url.startsWith("jdbc:spanner"))) {
       try {
         Matcher matcher = URL_PATTERN.matcher(url);
         Matcher matcherExternalHost = EXTERNAL_HOST_URL_PATTERN.matcher(url);

src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java

@@ -50,6 +50,7 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -217,29 +218,37 @@ public void testLenient() throws SQLException {
 
   @Test
   public void testJdbcExternalHostFormat() {
+    Matcher matcher =
+        Pattern.compile("jdbc:\\(\\?:([a-z]+):.*").matcher(EXTERNAL_HOST_URL_PATTERN.pattern());
+    String prefix = matcher.matches() ? matcher.group(1) : null;
     Matcher matcherWithoutInstance =
-        EXTERNAL_HOST_URL_PATTERN.matcher("jdbc:cloudspanner://localhost:15000/databases/test-db");
+        EXTERNAL_HOST_URL_PATTERN.matcher(
+            String.format("jdbc:%s://localhost:15000/databases/test-db", prefix));
     assertTrue(matcherWithoutInstance.matches());
     assertEquals("test-db", matcherWithoutInstance.group("DATABASEGROUP"));
     Matcher matcherWithProperty =
         EXTERNAL_HOST_URL_PATTERN.matcher(
-            "jdbc:cloudspanner://localhost:15000/instances/default/databases/singers-db?usePlainText=true");
+            String.format(
+                "jdbc:%s://localhost:15000/instances/default/databases/singers-db?usePlainText=true",
+                prefix));
     assertTrue(matcherWithProperty.matches());
     assertEquals("default", matcherWithProperty.group("INSTANCEGROUP"));
     assertEquals("singers-db", matcherWithProperty.group("DATABASEGROUP"));
     Matcher matcherWithoutPort =
         EXTERNAL_HOST_URL_PATTERN.matcher(
-            "jdbc:cloudspanner://localhost/instances/default/databases/test-db");
+            String.format("jdbc:%s://localhost/instances/default/databases/test-db", prefix));
     assertTrue(matcherWithoutPort.matches());
     assertEquals("default", matcherWithoutPort.group("INSTANCEGROUP"));
     assertEquals("test-db", matcherWithoutPort.group("DATABASEGROUP"));
     Matcher matcherWithProject =
         EXTERNAL_HOST_URL_PATTERN.matcher(
-            "jdbc:cloudspanner://localhost:15000/projects/default/instances/default/databases/singers-db");
+            String.format(
+                "jdbc:%s://localhost:15000/projects/default/instances/default/databases/singers-db",
+                prefix));
     assertFalse(matcherWithProject.matches());
     Matcher matcherWithoutHost =
         EXTERNAL_HOST_URL_PATTERN.matcher(
-            "jdbc:cloudspanner:/instances/default/databases/singers-db");
+            String.format("jdbc:%s:/instances/default/databases/singers-db", prefix));
     assertFalse(matcherWithoutHost.matches());
   }
 }