Fix regex for MySQL and PostgreSQL connection URL

revbingo · Aug 20, 2011 · 6d7bdf0 · 6d7bdf0
1 parent c0df25e
commit 6d7bdf0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java
@@ -204,7 +204,7 @@ private static boolean changed() {
             p.put("db.destroyMethod", "close");
         }
 
-        Matcher m = new jregex.Pattern("^mysql:(//)?(({user}[\\w]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[\\w]+)$").matcher(p.getProperty("db", ""));
+        Matcher m = new jregex.Pattern("^mysql:(//)?(({user}[a-zA-Z0-9_]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[^\\s]+)$").matcher(p.getProperty("db", ""));
         if (m.matches()) {
             String user = m.group("user");
             String password = m.group("pwd");
@@ -220,7 +220,7 @@ private static boolean changed() {
             }
         }
 
-        m = new jregex.Pattern("^postgres:(//)?(({user}[\\w]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[\\w]+)$").matcher(p.getProperty("db", ""));
+        m = new jregex.Pattern("^postgres:(//)?(({user}[a-zA-Z0-9_]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[^\\s]+)$").matcher(p.getProperty("db", ""));
         if (m.matches()) {
             String user = m.group("user");
             String password = m.group("pwd");