Fix Database/ from always being appended to the driver name.

Fixes cakephp#3223
arlonlove · Sep 20, 2012 · 3dd82e6 · 3dd82e6
1 parent d12f50a
commit 3dd82e6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -315,8 +315,11 @@ public function bake($configs) {
 			$config = array_merge($this->_defaultConfig, $config);
 			extract($config);
 
+			if (strpos($datasource, 'Database/') === false) {
+				$datasource = "Database/{$datasource}";
+			}
 			$out .= "\tpublic \${$name} = array(\n";
-			$out .= "\t\t'datasource' => 'Database/{$datasource}',\n";
+			$out .= "\t\t'datasource' => '{$datasource}',\n";
 			$out .= "\t\t'persistent' => {$persistent},\n";
 			$out .= "\t\t'host' => '{$host}',\n";