Fix parsing empty connection parameters

testcontainers · Dec 19, 2019 · d013889 · d013889
1 parent e6f92c6
commit d013889
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java b/modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
@@ -228,7 +228,7 @@ public interface Patterns {
 
         Pattern TC_PARAM_MATCHING_PATTERN = Pattern.compile(TC_PARAM_NAME_PATTERN + "=([^\\?&]+)");
 
-        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^\\?&=]+)=([^\\?&]+)");
+        Pattern QUERY_PARAM_MATCHING_PATTERN = Pattern.compile("([^\\?&=]+)=([^\\?&]*)");
 
     }
 

diff --git a/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java b/modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
@@ -49,6 +49,12 @@ public void testConnectionUrl2() {
 
     }
 
+    @Test
+    public void testEmptyQueryParameter() {
+        ConnectionUrl url = ConnectionUrl.newInstance("jdbc:tc:mysql://somehostname/databasename?key=");
+        assertEquals("'key' property value", "", url.getQueryParameters().get("key"));
+    }
+
     @Test
     public void testTmpfsOption() {
         String urlString = "jdbc:tc:mysql://somehostname/databasename?TC_TMPFS=key:value,key1:value1";