Always set configKeyName on connections.

This is useful in fixtures for figuring out where a fixture was added. This property will hopefully be removed, but for now it is a necessary crutch.
cakephp · May 25, 2013 · b54795c · b54795c
1 parent a17a69f
commit b54795c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Cake/Database/Connection.php b/lib/Cake/Database/Connection.php
@@ -31,6 +31,13 @@ class Connection {
 
 	use TypeConverterTrait;
 
+/**
+ * The configuration name used for this connection.
+ *
+ * @var string
+ */
+	public $configKeyName = null;
+
 /**
  * Contains the configuration params for this connection
  *

diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
@@ -114,8 +114,8 @@ public static function getDataSource($name) {
 			static::$_dataSources[$name] = new Connection(static::$config[$name]);
 		} else {
 			static::$_dataSources[$name] = new $class(static::$config[$name]);
-			static::$_dataSources[$name]->configKeyName = $name;
 		}
+		static::$_dataSources[$name]->configKeyName = $name;
 
 		return static::$_dataSources[$name];
 	}