Renaming schema.php to cake_schema.php. Modifying relevant App::impor…

…t calls.
cakephp · Mar 16, 2009 · 70e0316 · 70e0316
1 parent 527b1f9
commit 70e0316
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
@@ -26,7 +26,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 App::import('File');
-App::import('Model', 'Schema');
+App::import('Model', 'CakeSchema');
 /**
  * Schema is a command-line database management utility for automating programmer chores.
  *

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
@@ -832,7 +832,7 @@ function help() {
  */
 	function fixture($model, $useTable = null) {
 		if (!class_exists('CakeSchema')) {
-			App::import('Model', 'Schema');
+			App::import('Model', 'CakeSchema');
 		}
 		$out = "\nclass {$model}Fixture extends CakeTestFixture {\n";
 		$out .= "\tvar \$name = '$model';\n";

diff --git a/cake/libs/model/schema.php → cake/libs/model/cake_schema.php b/cake/libs/model/schema.php → cake/libs/model/cake_schema.php
diff --git a/cake/tests/cases/libs/model/schema.test.php → ...sts/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/schema.test.php → ...sts/cases/libs/model/cake_schema.test.php
@@ -23,7 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', 'Schema');
+App::import('Core', 'CakeSchema');
 
 /**
  * Test for Schema database management

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -509,7 +509,7 @@ function testColumn() {
  * @return void
  */
 	function testAlterSchemaIndexes() {
-		App::import('Core', 'Schema');
+		App::import('Core', 'CakeSchema');
 		$this->db->cacheSources = $this->db->testing = false;
 
 		$schema1 =& new CakeSchema(array(

diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
@@ -50,7 +50,7 @@ class CakeTestFixture extends Object {
  * @access public
  */
 	function __construct() {
-		App::import('Model', 'Schema');
+		App::import('Model', 'CakeSchema');
 		$this->Schema = new CakeSchema(array('name' => 'TestSuite', 'connection' => 'test_suite'));
 
 		$this->init();