Skip to content

Commit

Permalink
Rename files
Browse files Browse the repository at this point in the history
I find it is easier to keep editor tabs straight when there are fewer
files with the same name.
  • Loading branch information
markstory committed Apr 27, 2013
1 parent 2012437 commit a92cddf
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 38 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Database/Dialect/MysqlDialectTrait.php
Expand Up @@ -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);
}

}
4 changes: 2 additions & 2 deletions lib/Cake/Database/Dialect/PostgresDialectTrait.php
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions lib/Cake/Database/Dialect/SqliteDialectTrait.php
Expand Up @@ -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);
}

}
Expand Up @@ -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.
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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.
Expand Down
9 changes: 0 additions & 9 deletions lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php
Expand Up @@ -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.
*
Expand Down
Expand Up @@ -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.
Expand Down Expand Up @@ -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));
}

Expand All @@ -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));
}

Expand Down
Expand Up @@ -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.
Expand Down Expand Up @@ -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));
}

Expand Down
Expand Up @@ -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.
Expand Down Expand Up @@ -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));
}

Expand Down

0 comments on commit a92cddf

Please sign in to comment.