From a92cddfe9d200e0df1dbeb2e18123c3c7f1fa2ec Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 26 Apr 2013 22:05:07 -0400 Subject: [PATCH] Rename files I find it is easier to keep editor tabs straight when there are fewer files with the same name. --- lib/Cake/Database/Dialect/MysqlDialectTrait.php | 4 ++-- lib/Cake/Database/Dialect/PostgresDialectTrait.php | 4 ++-- lib/Cake/Database/Dialect/SqliteDialectTrait.php | 4 ++-- .../Schema/{Dialect/Mysql.php => MysqlSchema.php} | 4 ++-- .../{Dialect/Postgres.php => PostgresSchema.php} | 4 ++-- .../Schema/{Dialect/Sqlite.php => SqliteSchema.php} | 4 ++-- .../Test/TestCase/Database/Schema/CollectionTest.php | 9 --------- .../{Dialect/MysqlTest.php => MysqlSchemaTest.php} | 11 +++++------ .../PostgresTest.php => PostgresSchemaTest.php} | 11 +++++------ .../{Dialect/SqliteTest.php => SqliteSchemaTest.php} | 9 ++++----- 10 files changed, 26 insertions(+), 38 deletions(-) rename lib/Cake/Database/Schema/{Dialect/Mysql.php => MysqlSchema.php} (98%) rename lib/Cake/Database/Schema/{Dialect/Postgres.php => PostgresSchema.php} (98%) rename lib/Cake/Database/Schema/{Dialect/Sqlite.php => SqliteSchema.php} (98%) rename lib/Cake/Test/TestCase/Database/Schema/{Dialect/MysqlTest.php => MysqlSchemaTest.php} (95%) rename lib/Cake/Test/TestCase/Database/Schema/{Dialect/PostgresTest.php => PostgresSchemaTest.php} (95%) rename lib/Cake/Test/TestCase/Database/Schema/{Dialect/SqliteTest.php => SqliteSchemaTest.php} (95%) diff --git a/lib/Cake/Database/Dialect/MysqlDialectTrait.php b/lib/Cake/Database/Dialect/MysqlDialectTrait.php index 4c399a91296..7c558e10ae2 100644 --- a/lib/Cake/Database/Dialect/MysqlDialectTrait.php +++ b/lib/Cake/Database/Dialect/MysqlDialectTrait.php @@ -48,10 +48,10 @@ trait MysqlDialectTrait { * Used by Cake\Schema package to reflect schema and * generate schema. * - * @return Cake\Database\Schema\Dialect\Mysql + * @return Cake\Database\Schema\MysqlSchema */ public function schemaDialect() { - return new \Cake\Database\Schema\Dialect\Mysql($this); + return new \Cake\Database\Schema\MysqlSchema($this); } } diff --git a/lib/Cake/Database/Dialect/PostgresDialectTrait.php b/lib/Cake/Database/Dialect/PostgresDialectTrait.php index 8a9363e7cdf..83e8492c185 100644 --- a/lib/Cake/Database/Dialect/PostgresDialectTrait.php +++ b/lib/Cake/Database/Dialect/PostgresDialectTrait.php @@ -153,9 +153,9 @@ protected function _transformFunctionExpression(FunctionExpression $expression) * Used by Cake\Schema package to reflect schema and * generate schema. * - * @return Cake\Database\Schema\Dialect\Postgres + * @return Cake\Database\Schema\PostgresSchema */ public function schemaDialect() { - return new \Cake\Database\Schema\Dialect\Postgres($this); + return new \Cake\Database\Schema\PostgresSchema($this); } } diff --git a/lib/Cake/Database/Dialect/SqliteDialectTrait.php b/lib/Cake/Database/Dialect/SqliteDialectTrait.php index 0feacec5f33..82db0f0c138 100644 --- a/lib/Cake/Database/Dialect/SqliteDialectTrait.php +++ b/lib/Cake/Database/Dialect/SqliteDialectTrait.php @@ -132,10 +132,10 @@ protected function _insertQueryTranslator($query) { * Used by Cake\Schema package to reflect schema and * generate schema. * - * @return Cake\Database\Schema\Dialect\Sqlite + * @return Cake\Database\Schema\SqliteSchema */ public function schemaDialect() { - return new \Cake\Database\Schema\Dialect\Sqlite($this); + return new \Cake\Database\Schema\SqliteSchema($this); } } diff --git a/lib/Cake/Database/Schema/Dialect/Mysql.php b/lib/Cake/Database/Schema/MysqlSchema.php similarity index 98% rename from lib/Cake/Database/Schema/Dialect/Mysql.php rename to lib/Cake/Database/Schema/MysqlSchema.php index d004c34c845..0dddd7aceba 100644 --- a/lib/Cake/Database/Schema/Dialect/Mysql.php +++ b/lib/Cake/Database/Schema/MysqlSchema.php @@ -14,9 +14,9 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Database\Schema\Dialect; +namespace Cake\Database\Schema; -class Mysql { +class MysqlSchema { /** * The driver instance being used. diff --git a/lib/Cake/Database/Schema/Dialect/Postgres.php b/lib/Cake/Database/Schema/PostgresSchema.php similarity index 98% rename from lib/Cake/Database/Schema/Dialect/Postgres.php rename to lib/Cake/Database/Schema/PostgresSchema.php index cab20813840..8a492d60df3 100644 --- a/lib/Cake/Database/Schema/Dialect/Postgres.php +++ b/lib/Cake/Database/Schema/PostgresSchema.php @@ -14,9 +14,9 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Database\Schema\Dialect; +namespace Cake\Database\Schema; -class Postgres { +class PostgresSchema { /** * The driver instance being used. diff --git a/lib/Cake/Database/Schema/Dialect/Sqlite.php b/lib/Cake/Database/Schema/SqliteSchema.php similarity index 98% rename from lib/Cake/Database/Schema/Dialect/Sqlite.php rename to lib/Cake/Database/Schema/SqliteSchema.php index 98fce3c9f43..d283551c3c9 100644 --- a/lib/Cake/Database/Schema/Dialect/Sqlite.php +++ b/lib/Cake/Database/Schema/SqliteSchema.php @@ -14,9 +14,9 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Database\Schema\Dialect; +namespace Cake\Database\Schema; -class Sqlite { +class SqliteSchema { /** * The driver instance being used. diff --git a/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php b/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php index c684dd61321..a088a14e72e 100644 --- a/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php +++ b/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php @@ -44,18 +44,9 @@ public function setUp() { */ public function tearDown() { parent::tearDown(); - $this->connection->disconnect(); unset($this->connection); } -/** - * Test getting table listings. - * - * @return void - */ - public function testListTables() { - } - /** * Test getting simple descriptions for tables. * diff --git a/lib/Cake/Test/TestCase/Database/Schema/Dialect/MysqlTest.php b/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php similarity index 95% rename from lib/Cake/Test/TestCase/Database/Schema/Dialect/MysqlTest.php rename to lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php index 927dab12f36..ec62c0550cf 100644 --- a/lib/Cake/Test/TestCase/Database/Schema/Dialect/MysqlTest.php +++ b/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php @@ -14,20 +14,19 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Test\TestCase\Database\Schema\Dialect; +namespace Cake\Test\TestCase\Database\Schema; use Cake\Core\Configure; use Cake\Database\Connection; use Cake\Database\Schema\Collection as SchemaCollection; -use Cake\Database\Schema\Dialect\Mysql; -use Cake\Database\Schema\Driver\Mysql as MysqlDriver; +use Cake\Database\Schema\MysqlSchema; use Cake\TestSuite\TestCase; /** * Test case for Mysql Schema Dialect. */ -class MysqlTest extends TestCase { +class MysqlSchemaTest extends TestCase { /** * Helper method for skipping tests that need a real connection. @@ -117,7 +116,7 @@ public static function columnProvider() { */ public function testConvertColumnType($input, $expected) { $driver = $this->getMock('Cake\Database\Driver\Mysql'); - $dialect = new Mysql($driver); + $dialect = new MysqlSchema($driver); $this->assertEquals($expected, $dialect->convertColumn($input)); } @@ -141,7 +140,7 @@ public static function convertIndexProvider() { */ public function testConvertIndex($input, $expected) { $driver = $this->getMock('Cake\Database\Driver\Mysql'); - $dialect = new Mysql($driver); + $dialect = new MysqlSchema($driver); $this->assertEquals($expected, $dialect->convertIndex($input)); } diff --git a/lib/Cake/Test/TestCase/Database/Schema/Dialect/PostgresTest.php b/lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php similarity index 95% rename from lib/Cake/Test/TestCase/Database/Schema/Dialect/PostgresTest.php rename to lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php index dcca985dfa3..a497164a110 100644 --- a/lib/Cake/Test/TestCase/Database/Schema/Dialect/PostgresTest.php +++ b/lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php @@ -14,19 +14,18 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Test\TestCase\Database\Schema\Dialect; +namespace Cake\Test\TestCase\Database\Schema; use Cake\Core\Configure; use Cake\Database\Connection; use Cake\Database\Schema\Collection as SchemaCollection; -use Cake\Database\Schema\Dialect\Postgres; -use Cake\Database\Schema\Driver\Postgres as PostgresDriver; +use Cake\Database\Schema\PostgresSchema; use Cake\TestSuite\TestCase; /** - * Postgres dialect test case. + * Postgres schema test case. */ -class PostgresTest extends TestCase { +class PostgresSchemaTest extends TestCase { /** * Helper method for skipping tests that need a real connection. @@ -180,7 +179,7 @@ public static function columnProvider() { */ public function testConvertColumnType($input, $expected) { $driver = $this->getMock('Cake\Database\Driver\Postgres'); - $dialect = new Postgres($driver); + $dialect = new PostgresSchema($driver); $this->assertEquals($expected, $dialect->convertColumn($input)); } diff --git a/lib/Cake/Test/TestCase/Database/Schema/Dialect/SqliteTest.php b/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php similarity index 95% rename from lib/Cake/Test/TestCase/Database/Schema/Dialect/SqliteTest.php rename to lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php index 8bacf0b736c..d83e3ad113e 100644 --- a/lib/Cake/Test/TestCase/Database/Schema/Dialect/SqliteTest.php +++ b/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php @@ -14,20 +14,19 @@ * @since CakePHP(tm) v 3.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -namespace Cake\Test\TestCase\Database\Schema\Dialect; +namespace Cake\Test\TestCase\Database\Schema; use Cake\Core\Configure; use Cake\Database\Connection; use Cake\Database\Schema\Collection as SchemaCollection; -use Cake\Database\Schema\Dialect\Sqlite; -use Cake\Database\Schema\Driver\Sqlite as SqliteDriver; +use Cake\Database\Schema\SqliteSchema; use Cake\TestSuite\TestCase; /** * Test case for Sqlite Schema Dialect. */ -class SqliteTest extends TestCase { +class SqliteSchemaTest extends TestCase { /** * Helper method for skipping tests that need a real connection. @@ -117,7 +116,7 @@ public static function columnProvider() { */ public function testConvertColumnType($input, $expected) { $driver = $this->getMock('Cake\Database\Driver\Sqlite'); - $dialect = new Sqlite($driver); + $dialect = new SqliteSchema($driver); $this->assertEquals($expected, $dialect->convertColumn($input)); }