Permalink
Browse files

Getting a list of connections in the constructor of ConnectionManager

class. Fixes issues where using ConnectionManager::create() before the
standard connections are enumerated will result in the standard
connections never being enumerated.  Fixes #206

Signed-off-by: Mark Story <mark@mark-story.com>
  • Loading branch information...
1 parent 2915493 commit b21538c4265f4bacf868486ae940f4cae0923f0e @jrbasso jrbasso committed with markstory Jan 16, 2010
Showing with 25 additions and 19 deletions.
  1. +25 −19 cake/libs/model/connection_manager.php
@@ -62,6 +62,7 @@ function __construct() {
if (class_exists('DATABASE_CONFIG')) {
$this->config =& new DATABASE_CONFIG();
}
+ $this->_getConnectionObjects();
}
/**
@@ -96,14 +97,13 @@ function &getDataSource($name) {
$return =& $_this->_dataSources[$name];
return $return;
}
- $connections = $_this->enumConnectionObjects();
- if (empty($connections[$name])) {
+ if (empty($_this->_connectionsEnum[$name])) {
trigger_error(sprintf(__("ConnectionManager::getDataSource - Non-existent data source %s", true), $name), E_USER_ERROR);
$null = null;
return $null;
}
- $conn = $connections[$name];
+ $conn = $_this->_connectionsEnum[$name];
$class = $conn['classname'];
if ($_this->loadDataSource($name) === null) {
@@ -165,8 +165,7 @@ function loadDataSource($connName) {
if (is_array($connName)) {
$conn = $connName;
} else {
- $connections = $_this->enumConnectionObjects();
- $conn = $connections[$connName];
+ $conn = $_this->_connectionsEnum[$connName];
}
if (class_exists($conn['classname'])) {
@@ -188,7 +187,7 @@ function loadDataSource($connName) {
}
/**
- * Gets a list of class and file names associated with the user-defined DataSource connections
+ * Return a list of connections
*
* @return array An associative array of elements where the key is the connection name
* (as defined in Connections), and the value is an array with keys 'filename' and 'classname'.
@@ -198,19 +197,7 @@ function loadDataSource($connName) {
function enumConnectionObjects() {
$_this =& ConnectionManager::getInstance();
- if (!empty($_this->_connectionsEnum)) {
- return $_this->_connectionsEnum;
- }
- $connections = get_object_vars($_this->config);
-
- if ($connections != null) {
- foreach ($connections as $name => $config) {
- $_this->_connectionsEnum[$name] = $_this->__connectionData($config);
- }
- return $_this->_connectionsEnum;
- } else {
- $_this->cakeError('missingConnection', array(array('className' => 'ConnectionManager')));
- }
+ return $_this->_connectionsEnum;
}
/**
@@ -236,6 +223,25 @@ function &create($name = '', $config = array()) {
}
/**
+ * Gets a list of class and file names associated with the user-defined DataSource connections
+ *
+ * @return void
+ * @access protected
+ * @static
+ */
+ function _getConnectionObjects() {
+ $connections = get_object_vars($this->config);
+
+ if ($connections != null) {
+ foreach ($connections as $name => $config) {
+ $this->_connectionsEnum[$name] = $this->__connectionData($config);
+ }
+ } else {
+ $this->cakeError('missingConnection', array(array('className' => 'ConnectionManager')));
+ }
+ }
+
+/**
* Returns the file, class name, and parent for the given driver.
*
* @return array An indexed array with: filename, classname, plugin and parent

0 comments on commit b21538c

Please sign in to comment.