From be1263d4760238c290016dce621c082666de7cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?= Date: Sat, 4 Dec 2010 11:52:23 -0430 Subject: [PATCH] Moving the first database driver to the correct folder to start testing --- lib/Cake/Model/ConnectionManager.php | 9 +++------ .../Cake/Model/Datasource/Database/Mysql.php | 0 2 files changed, 3 insertions(+), 6 deletions(-) rename cake/libs/model/datasources/dbo/dbo_mysql.php => lib/Cake/Model/Datasource/Database/Mysql.php (100%) diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php index e07371a03..b6ff55252 100644 --- a/lib/Cake/Model/ConnectionManager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -165,14 +165,11 @@ class ConnectionManager { return false; } - if (!empty($conn['parent'])) { - $_this->loadDataSource($conn['parent']); - } - $conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn); - $class = "{$conn['plugin']}.{$conn['classname']}"; + $class = trim("{$conn['plugin']}.{$conn['classname']}", '.'); - if (!App::import('Datasource', $class, !is_null($conn['plugin']))) { + App::uses($class, 'Model/Datasource'); + if (class_exists($class)) { trigger_error(sprintf(__('ConnectionManager::loadDataSource - Unable to import DataSource class %s'), $class), E_USER_ERROR); return null; } diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php similarity index 100% rename from cake/libs/model/datasources/dbo/dbo_mysql.php rename to lib/Cake/Model/Datasource/Database/Mysql.php