adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-10 05:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.1

Browse source 
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
This commit is contained in:
mark_story 2011-12-11 22:51:40 -05:00
commit 2e8498e166
162 changed files with 920 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Test/Case/Model/CakeSchemaTest.php
View file

@ -440,12 +440,14 @@ class SchemaPrefixAuthUser extends CakeTestModel {
* @var string
*/
public $name = 'SchemaPrefixAuthUser';
/**
* table prefix
*
* @var string
*/
public $tablePrefix = 'auth_';
/**
* useTable
*
@ -640,8 +642,11 @@ class CakeSchemaTest extends CakeTestCase {
*/
public function testSchemaReadWithConfigPrefix() {
$this->skipIf($this->db instanceof Sqlite, 'Cannot open 2 connections to Sqlite');
$db = ConnectionManager::getDataSource('test');
$config = $db->config;
$this->skipIf(!empty($config['prefix']), 'This test can not be executed with datasource prefix set.');
$config['prefix'] = 'schema_test_prefix_';
ConnectionManager::create('schema_prefix', $config);
$read = $this->Schema->read(array('connection' => 'schema_prefix', 'models' => false));
@ -743,6 +748,7 @@ class CakeSchemaTest extends CakeTestCase {
$result = $this->Schema->generateTable('posts', $posts);
$this->assertRegExp('/public \$posts/', $result);
}
/**
* testSchemaWrite method
*