adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring out to use DbConfig::getConfig

Browse source 
Continuing fixture bake
This commit is contained in:
mark_story 2009-04-28 20:45:07 -04:00
parent 802ed73c0a
commit 0b40e5c709
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/console/libs/tasks/fixture.php
View file

@ -42,7 +42,7 @@ class FixtureTask extends Shell {
* @var array * @var array
* @access public * @access public
*/ */
var $tasks = array('Model'); var $tasks = array('DbConfig', 'Model');
/** /**
* path to fixtures directory * path to fixtures directory
* *
@ -107,7 +107,12 @@ class FixtureTask extends Shell {
* @access private * @access private
*/ */
function __interactive($modelName = false) { function __interactive($modelName = false) {
$this->interactive = true;
$this->hr();
$this->out(sprintf("Bake Fixture\nPath: %s", $this->path));
$this->hr();
$useDbConfig = $this->DbConfig->getConfig();
} }
/** /**

14
cake/console/libs/tasks/model.php
View file

@ -117,18 +117,8 @@ class ModelTask extends Shell {
$primaryKey = 'id'; $primaryKey = 'id';
$validate = array(); $validate = array();
$associations = array('belongsTo'=> array(), 'hasOne'=> array(), 'hasMany' => array(), 'hasAndBelongsToMany'=> array()); $associations = array('belongsTo'=> array(), 'hasOne'=> array(), 'hasMany' => array(), 'hasAndBelongsToMany'=> array());
$useDbConfig = 'default'; $useDbConfig = $this->DbConfig->getConfig();
$configs = get_class_vars('DATABASE_CONFIG');
if (!is_array($configs)) {
return $this->DbConfig->execute();
}
$connections = array_keys($configs);
if (count($connections) > 1) {
$useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default');
}
$currentModelName = $this->getName($useDbConfig); $currentModelName = $this->getName($useDbConfig);
$db =& ConnectionManager::getDataSource($useDbConfig); $db =& ConnectionManager::getDataSource($useDbConfig);