adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

model and db_config task fixes

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5760 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-10-15 07:48:19 +00:00
parent 9c7f0755a5
commit 68c63b67f3
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/console/libs/tasks/db_config.php
View file

@ -37,6 +37,11 @@ if (!class_exists('File')) {
*/ */
class DbConfigTask extends Shell { class DbConfigTask extends Shell {
var $__defaultConfig = array('name' => 'default', 'driver'=> 'mysql', 'persistent'=> 'false', 'host'=> 'localhost',
'login'=> 'root', 'password'=> 'password', 'database'=> 'project_name',
'schema'=> null, 'prefix'=> null);
/** /**
* Execution method always used for tasks * Execution method always used for tasks
* *
@ -143,10 +148,7 @@ class DbConfigTask extends Shell {
* @return bool * @return bool
*/ */
function __verify($config) { function __verify($config) {
$defaults = array('name' => 'default', 'driver'=> 'mysql', 'persistent'=> 'false', 'host'=> 'localhost', $config = am($this->__defaultConfig, $config);
'login'=> 'root', 'password'=> 'password', 'database'=> 'project_name',
'schema'=> null,'prefix'=> null);
$config = am($defaults, $config);
extract($config); extract($config);
$this->out(''); $this->out('');
$this->hr(); $this->hr();
@ -165,7 +167,7 @@ class DbConfigTask extends Shell {
$looksGood = $this->in('Look okay?', array('y', 'n'), 'y'); $looksGood = $this->in('Look okay?', array('y', 'n'), 'y');
if (low($looksGood) == 'y' || low($looksGood) == 'yes') { if (low($looksGood) == 'y' || low($looksGood) == 'yes') {
return true; return $config;
} }
return false; return false;
} }
@ -184,6 +186,7 @@ class DbConfigTask extends Shell {
$out .= "class DATABASE_CONFIG {\n\n"; $out .= "class DATABASE_CONFIG {\n\n";
foreach ($configs as $config) { foreach ($configs as $config) {
$config = am($this->__defaultConfig, $config);
extract($config); extract($config);
$out .= "\tvar \${$name} = array(\n"; $out .= "\tvar \${$name} = array(\n";
$out .= "\t\t'driver' => '{$driver}',\n"; $out .= "\t\t'driver' => '{$driver}',\n";

2
cake/libs/model/model.php
View file

@ -853,6 +853,7 @@ class Model extends Overloadable {
* @deprecated * @deprecated
*/ */
function loadInfo($clear = false) { function loadInfo($clear = false) {
if (!is_object($this->_tableInfo) || $clear) {
$info = $this->schema($clear); $info = $this->schema($clear);
$fields = array(); $fields = array();
foreach($info->value as $field => $value) { foreach($info->value as $field => $value) {
@ -860,6 +861,7 @@ class Model extends Overloadable {
} }
unset($info); unset($info);
$this->_tableInfo = new Set($fields); $this->_tableInfo = new Set($fields);
}
return $this->_tableInfo; return $this->_tableInfo;
} }
/** /**