--- dbscripts/dbscripts.module	2008-07-06 07:20:35.000000000 -0700
+++ dbscripts/dbscripts.module	2008-07-11 02:53:00.000000000 -0700
@@ -6,15 +6,12 @@
 function dbscripts_db_connect() {
   require('config.inc');
   require("$settings_path/settings.php");
-  
-  preg_match('/'.$dbtype.':\/\/([^:]+):([^@]+)@([^\/]+)\/(.+)/', $db_url, $db_settings);
 
-  $dbuser = $db_settings[1];
-  $dbpassword = $db_settings[2];
-  $dbhost = $db_settings[3];
-  $dbname = $db_settings[4];
+  $db_url = is_array($db_url) ? $db_url['default'] : $db_url;
+  $db = parse_url($db_url);
+  $db['db'] = ltrim($db['path'], '/');
 
-  return "-u $dbuser -p$dbpassword -h $dbhost $dbname";
+  return '-h ' . $db['host'] . ' -u ' . $db['user'] . ' -p' . $db['pass'] . ' ' . $db['db'];
 }