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

Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

Browse source
This commit is contained in:
Mark Story 2010-02-16 23:19:11 -05:00
commit 42a5665660
5 changed files with 104 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/model/connection_manager.php
View file

@ -256,14 +256,20 @@ class ConnectionManager extends Object {
$filename = $classname = $parent = $plugin = null;
if (!empty($config['driver'])) {
$source = $config['datasource'] . '_' . $config['driver'];
$filename = $config['datasource'] . DS . $source;
$classname = Inflector::camelize(strtolower($source));
$parent = $this->__connectionData(array('datasource' => $config['datasource']));
$parentSource = preg_replace('/_source$/', '', $parent['filename']);
list($plugin, $classname) = pluginSplit($config['driver']);
if ($plugin) {
$source = Inflector::underscore($classname);
} else {
$source = $parentSource . '_' . $config['driver'];
$classname = Inflector::camelize(strtolower($source));
}
$filename = $parentSource . DS . $source;
} else {
if (strpos($config['datasource'], '.') !== false) {
list($plugin, $classname) = explode('.', $config['datasource']);
list($plugin, $classname) = pluginSplit($config['datasource']);
if ($plugin) {
$filename = Inflector::underscore($classname);
} else {
$filename = $config['datasource'] . '_source';

71
cake/tests/cases/libs/model/connection_manager.test.php
View file

@ -113,6 +113,77 @@ class ConnectionManagerTest extends CakeTestCase {
App::build();
}
/**
* testGetPluginDataSourceAndPluginDriver method
*
* @access public
* @return void
*/
function testGetPluginDataSourceAndPluginDriver() {
App::build(array(
'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
));
$name = 'test_plugin_source_and_driver';
$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'TestPlugin.TestDriver');
$connection = ConnectionManager::create($name, $config);
$this->assertTrue(class_exists('TestSource'));
$this->assertTrue(class_exists('TestDriver'));
$this->assertEqual($connection->configKeyName, $name);
$this->assertEqual($connection->config, $config);
App::build();
}
/**
* testGetLocalDataSourceAndPluginDriver method
*
* @access public
* @return void
*/
function testGetLocalDataSourceAndPluginDriver() {
App::build(array(
'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
));
$name = 'test_local_source_and_plugin_driver';
$config = array('datasource' => 'dbo', 'driver' => 'TestPlugin.DboDummy');
$connection = ConnectionManager::create($name, $config);
$this->assertTrue(class_exists('DboSource'));
$this->assertTrue(class_exists('DboDummy'));
$this->assertEqual($connection->configKeyName, $name);
App::build();
}
/**
* testGetPluginDataSourceAndLocalDriver method
*
* @access public
* @return void
*/
function testGetPluginDataSourceAndLocalDriver() {
App::build(array(
'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
));
$name = 'test_plugin_source_and_local_driver';
$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'local_driver');
$connection = ConnectionManager::create($name, $config);
$this->assertTrue(class_exists('TestSource'));
$this->assertTrue(class_exists('TestLocalDriver'));
$this->assertEqual($connection->configKeyName, $name);
$this->assertEqual($connection->config, $config);
App::build();
}
/**
* testSourceList method
*

6
cake/tests/test_app/models/datasources/test/test_local_driver.php Normal file
View file

@ -0,0 +1,6 @@
<?php
class TestLocalDriver extends TestSource {
}
?>

9
cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php Normal file
View file

@ -0,0 +1,9 @@
<?php
class DboDummy extends DboSource {
function connect() {
return true;
}
}
?>

6
cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php Normal file
View file

@ -0,0 +1,6 @@
<?php
class TestDriver extends TestSource {
}
?>