BaseSchema is abstract now. Add abstract methods and a constructor to BaseSchema.

_convertColumn is now protected, no need to expose to the public API.

Cake/Database/Driver.php

@@ -16,8 +16,6 @@
  */
 namespace Cake\Database;
 
-use \Cake\Database\SqlDialectTrait;
-
 /**
  * Represents a database diver containing all specificities for
  * a database engine including its SQL dialect

Cake/Database/Schema/BaseSchema.php

@@ -16,13 +16,33 @@
  */
 namespace Cake\Database\Schema;
 
+use Cake\Database\Driver;
+use Cake\Database\Schema\Table;
+
 /**
  * Base class for schema implementations.
  *
  * This class contains methods that are common across
  * the various SQL dialects.
  */
-class BaseSchema {
+abstract class BaseSchema {
+
+/**
+ * The driver instance being used.
+ *
+ * @var Cake\Database\Driver
+ */
+	protected $_driver;
+
+/**
+ * Constructor
+ *
+ * @param Cake\Database\Driver $driver The driver to use.
+ * @return void
+ */
+	public function __construct(Driver $driver) {
+		$this->_driver = $driver;
+	}
 
 /**
  * Generate an ON clause for a foreign key.
@@ -65,7 +85,7 @@ class BaseSchema {
  * Generate the SQL to drop a table.
  *
  * @param Cake\Database\Schema\Table $table Table instance
- * @return array SQL statements to drop DROP a table.
+ * @return array SQL statements to drop a table.
  */
 	public function dropTableSql(Table $table) {
 		$sql = sprintf(
@@ -75,4 +95,115 @@ class BaseSchema {
 		return [$sql];
 	}
 
+/**
+ * Generate the SQL to list the tables.
+ *
+ * @param array $config The connection configuration to use for
+ *    getting tables from.
+ * @return array An array of (sql, params) to execute.
+ */
+	abstract public function listTablesSql($config);
+
+/**
+ * Generate the SQL to describe a table.
+ *
+ * @param string $name The table name to get information on.
+ * @param array $config The connection configuration.
+ * @return array An array of (sql, params) to execute.
+ */
+	abstract public function describeTableSql($name, $config);
+
+/**
+ * Generate the SQL to describe the indexes in a table.
+ *
+ * @param string $table The table name to get information on.
+ * @param array $config The connection configuration.
+ * @return array An array of (sql, params) to execute.
+ */
+	abstract public function describeIndexSql($table, $config);
+
+/**
+ * Generate the SQL to describe the foreign keys in a table.
+ *
+ * @param string $table The table name to get information on.
+ * @param array $config The connection configuration.
+ * @return array An array of (sql, params) to execute.
+ */
+	abstract public function describeForeignKeySql($table, $config);
+
+/**
+ * Convert field description results into abstract schema fields.
+ *
+ * @param Cake\Database\Schema\Table $table The table object to append fields to.
+ * @param array $row The row data from `describeTableSql`.
+ * @return void
+ */
+	abstract public function convertFieldDescription(Table $table, $row);
+
+/**
+ * Convert an index description results into abstract schema indexes or constraints.
+ *
+ * @param Cake\Database\Schema\Table $table The table object to append
+ *    an index or constraint to.
+ * @param array $row The row data from `describeIndexSql`.
+ * @return void
+ */
+	abstract public function convertIndexDescription(Table $table, $row);
+
+/**
+ * Convert a foreign key description into constraints on the Table object.
+ *
+ * @param Cake\Database\Schema\Table $table The table object to append
+ *    a constraint to.
+ * @param array $row The row data from `describeForeignKeySql`.
+ * @return void
+ */
+	abstract public function convertForeignKeyDescription(Table $table, $row);
+
+/**
+ * Generate the SQL to create a table.
+ *
+ * @param Cake\Database\Schema\Table $table Table instance.
+ * @param array $columns The columns to go inside the table.
+ * @param array $constraints The constraints for the table.
+ * @param array $indexes The indexes for the table.
+ * @return array SQL statements to create a table.
+ */
+	abstract public function createTableSql(Table $table, $columns, $constraints, $indexes);
+
+/**
+ * Generate the SQL fragment for a single column in a table.
+ *
+ * @param Cake\Database\Schema\Table $table The table instance the column is in.
+ * @param string $name The name of the column.
+ * @return string SQL fragment.
+ */
+	abstract public function columnSql(Table $table, $name);
+
+/**
+ * Generate the SQL fragments for defining table constraints.
+ *
+ * @param Cake\Database\Schema\Table $table The table instance the column is in.
+ * @param string $name The name of the column.
+ * @return string SQL fragment.
+ */
+	abstract public function constraintSql(Table $table, $name);
+
+/**
+ * Generate the SQL fragment for a single index in a table.
+ *
+ * @param Cake\Database\Schema\Table $table The table object the column is in.
+ * @param string $name The name of the column.
+ * @return string SQL fragment.
+ */
+	abstract public function indexSql(Table $table, $name);
+
+/**
+ * Generate the SQL to truncate a table.
+ *
+ * @param Cake\Database\Schema\Table $table Table instance.
+ * @return array SQL statements to truncate a table.
+ */
+	abstract public function truncateTableSql(Table $table);
+
 }

Cake/Database/Schema/Collection.php

@@ -71,14 +71,13 @@ class Collection {
  * Get the column metadata for a table.
  *
  * @param string $name The name of the table to describe.
- * @return Cake\Schema\Table|null Object with column metadata, or null.
+ * @return Cake\Database\Schema\Table Object with column metadata.
  * @throws Cake\Database\Exception when table cannot be described.
  */
 	public function describe($name) {
-		list($sql, $params) = $this->_dialect->describeTableSql(
-			$name,
-			$this->_connection->config()
-		);
+		$config = $this->_connection->config();
+
+		list($sql, $params) = $this->_dialect->describeTableSql($name, $config);
 		$statement = $this->_executeSql($sql, $params);
 		if (count($statement) === 0) {
 			throw new Exception(__d('cake_dev', 'Cannot describe %s. It has 0 columns.', $name));
@@ -89,22 +88,16 @@ class Collection {
 			$this->_dialect->convertFieldDescription($table, $row);
 		}
 
-		list($sql, $params) = $this->_dialect->describeIndexSql(
-			$name,
-			$this->_connection->config()
-		);
+		list($sql, $params) = $this->_dialect->describeIndexSql($name, $config);
 		$statement = $this->_executeSql($sql, $params);
 		foreach ($statement->fetchAll('assoc') as $row) {
 			$this->_dialect->convertIndexDescription($table, $row);
 		}
 
-		list($sql, $params) = $this->_dialect->describeForeignKeySql(
-			$name,
-			$this->_connection->config()
-		);
+		list($sql, $params) = $this->_dialect->describeForeignKeySql($name, $config);
 		$statement = $this->_executeSql($sql, $params);
 		foreach ($statement->fetchAll('assoc') as $row) {
-			$this->_dialect->convertForeignKey($table, $row);
+			$this->_dialect->convertForeignKeyDescription($table, $row);
 		}
 		return $table;
 	}

Cake/Database/Schema/MysqlSchema.php

@@ -21,56 +21,32 @@ use Cake\Database\Schema\Table;
 
 /**
  * Schema management/reflection features for MySQL
- */
-class MysqlSchema extends BaseSchema {
-
-/**
- * The driver instance being used.
  *
- * @var Cake\Database\Driver\Mysql
  */
-	protected $_driver;
-
-/**
- * Constructor
- *
- * @param Cake\Database\Driver $driver The driver to use.
- * @return void
- */
-	public function __construct($driver) {
-		$this->_driver = $driver;
-	}
+class MysqlSchema extends BaseSchema {
 
 /**
- * Get the SQL to list the tables in MySQL
+ * {@inheritdoc}
  *
- * @param array $config The connection configuration to use for
- *    getting tables from.
- * @return array An array of (sql, params) to execute.
  */
-	public function listTablesSql(array $config) {
-		return ["SHOW TABLES FROM " . $this->_driver->quoteIdentifier($config['database']), []];
+	public function listTablesSql($config) {
+		return ['SHOW TABLES FROM ?', [$config['database']]];
 	}
 
 /**
- * Get the SQL to describe a table in MySQL.
+ * {@inheritdoc}
  *
- * @param string $table The table name to describe.
- * @return array An array of (sql, params) to execute.
  */
-	public function describeTableSql($table) {
-		return ["SHOW FULL COLUMNS FROM " . $this->_driver->quoteIdentifier($table), []];
+	public function describeTableSql($name, $config) {
+		return ['SHOW FULL COLUMNS FROM ?', [$name]];
 	}
 
 /**
- * Get the SQL to describe the indexes in a table.
+ * {@inheritdoc}
  *
- * @param string $table The table name to get information on.
- * @return array An array of (sql, params) to execute.
  */
-	public function describeIndexSql($table) {
-		$sql = sprintf('SHOW INDEXES FROM ' . $this->_driver->quoteIdentifier($table));
-		return [$sql, []];
+	public function describeIndexSql($table, $config) {
+		return ['SHOW INDEXES FROM ?', [$table]];
 	}
 
 /**
@@ -82,7 +58,7 @@ class MysqlSchema extends BaseSchema {
  * @return array Array of column information.
  * @throws Cake\Database\Exception When column type cannot be parsed.
  */
-	public function convertColumn($column) {
+	protected function _convertColumn($column) {
 		preg_match('/([a-z]+)(?:\(([0-9,]+)\))?/i', $column, $matches);
 		if (empty($matches)) {
 			throw new Exception(__d('cake_dev', 'Unable to parse column type from "%s"', $column));
@@ -133,14 +109,11 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Convert field description results into abstract schema fields.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object to append fields to.
- * @param array $row The row data from describeTableSql
- * @return void
  */
 	public function convertFieldDescription(Table $table, $row) {
-		$field = $this->convertColumn($row['Type']);
+		$field = $this->_convertColumn($row['Type']);
 		$field += [
 			'null' => $row['Null'] === 'YES' ? true : false,
 			'default' => $row['Default'],
@@ -151,12 +124,8 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Convert an index into the abstract description.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object to append
- *    an index or constraint to.
- * @param array $row The row data from describeIndexSql
- * @return void
  */
 	public function convertIndexDescription(Table $table, $row) {
 		$type = null;
@@ -181,8 +150,8 @@ class MysqlSchema extends BaseSchema {
 			$length[$row['Column_name']] = $row['Sub_part'];
 		}
 		$isIndex = (
-			$type == Table::INDEX_INDEX ||
-			$type == Table::INDEX_FULLTEXT
+			$type === Table::INDEX_INDEX ||
+			$type === Table::INDEX_FULLTEXT
 		);
 		if ($isIndex) {
 			$existing = $table->index($name);
@@ -190,8 +159,7 @@ class MysqlSchema extends BaseSchema {
 			$existing = $table->constraint($name);
 		}
 
-		// MySQL multi column indexes come back
-		// as multiple rows.
+		// MySQL multi column indexes come back as multiple rows.
 		if (!empty($existing)) {
 			$columns = array_merge($existing['columns'], $columns);
 			$length = array_merge($existing['length'], $length);
@@ -212,27 +180,23 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to describe the foreign keys on a table.
+ * {@inheritdoc}
  *
- * @return array List of sql, params
  */
 	public function describeForeignKeySql($table, $config) {
 		$sql = 'SELECT * FROM information_schema.key_column_usage AS kcu
 			INNER JOIN information_schema.referential_constraints AS rc
 			ON (kcu.CONSTRAINT_NAME = rc.CONSTRAINT_NAME)
-			WHERE kcu.TABLE_SCHEMA = ?
-			AND kcu.TABLE_NAME = ?';
+			WHERE kcu.TABLE_SCHEMA = ? AND kcu.TABLE_NAME = ?';
+
 		return [$sql, [$config['database'], $table]];
 	}
 
 /**
- * Convert a foreign key description into constraints on the Table object.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Table $table The table instance to populate.
- * @param array $row The row of data.
- * @return void
  */
-	public function convertForeignKey(Table $table, $row) {
+	public function convertForeignKeyDescription(Table $table, $row) {
 		$data = [
 			'type' => Table::CONSTRAINT_FOREIGN,
 			'columns' => [$row['COLUMN_NAME']],
@@ -245,46 +209,36 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to truncate a table.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table Table instance
- * @return array TRUNCATE TABLE sql
  */
 	public function truncateTableSql(Table $table) {
-		return [sprintf("TRUNCATE TABLE `%s`", $table->name())];
+		return [sprintf('TRUNCATE TABLE `%s`', $table->name())];
 	}
 
 /**
- * Generate the SQL to create a table.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table Table instance
- * @param array $columns The columns to go inside the table.
- * @param array $constraints The constraints for the table.
- * @param array $indexes The indexes for the table.
- * @return array Complete CREATE TABLE statement(s)
  */
 	public function createTableSql(Table $table, $columns, $constraints, $indexes) {
 		$content = implode(",\n", array_merge($columns, $constraints, $indexes));
 		$content = sprintf("CREATE TABLE `%s` (\n%s\n)", $table->name(), $content);
 		$options = $table->options();
 		if (isset($options['engine'])) {
-			$content .= sprintf(" ENGINE=%s", $options['engine']);
+			$content .= sprintf(' ENGINE=%s', $options['engine']);
 		}
 		if (isset($options['charset'])) {
-			$content .= sprintf(" DEFAULT CHARSET=%s", $options['charset']);
+			$content .= sprintf(' DEFAULT CHARSET=%s', $options['charset']);
 		}
 		if (isset($options['collate'])) {
-			$content .= sprintf(" COLLATE=%s", $options['collate']);
+			$content .= sprintf(' COLLATE=%s', $options['collate']);
 		}
 		return [$content];
 	}
 
 /**
- * Generate the SQL fragment for a single column in MySQL
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function columnSql(Table $table, $name) {
 		$data = $table->column($name);
@@ -356,11 +310,8 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragments for defining table constraints.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function constraintSql(Table $table, $name) {
 		$data = $table->constraint($name);
@@ -382,11 +333,8 @@ class MysqlSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single index in MySQL
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function indexSql(Table $table, $name) {
 		$data = $table->index($name);

Cake/Database/Schema/PostgresSchema.php

@@ -25,45 +25,22 @@ use Cake\Database\Schema\Table;
 class PostgresSchema extends BaseSchema {
 
 /**
- * The driver instance being used.
+ * {@inheritdoc}
  *
- * @var Cake\Database\Driver\Postgres
- */
-	protected $_driver;
-
-/**
- * Constructor
- *
- * @param Cake\Database\Driver\Postgres $driver Driver to use.
- * @return void
- */
-	public function __construct($driver) {
-		$this->_driver = $driver;
-	}
-
-/**
- * Get the SQL to list the tables
- *
- * @param array $config The connection configuration to use for
- *    getting tables from.
- * @return array An array of (sql, params) to execute.
  */
 	public function listTablesSql($config) {
-		$sql = "SELECT table_name as name FROM information_schema.tables WHERE table_schema = ? ORDER BY name";
+		$sql = 'SELECT table_name as name FROM information_schema.tables WHERE table_schema = ? ORDER BY name';
 		$schema = empty($config['schema']) ? 'public' : $config['schema'];
 		return [$sql, [$schema]];
 	}
 
 /**
- * Get the SQL to describe a table in Postgres.
+ * {@inheritdoc}
  *
- * @param string $table The table name to describe
- * @param array $config The connection configuration to use
- * @return array An array of (sql, params) to execute.
  */
-	public function describeTableSql($table, $config) {
+	public function describeTableSql($name, $config) {
 		$sql =
-		"SELECT DISTINCT table_schema AS schema, column_name AS name, data_type AS type,
+		'SELECT DISTINCT table_schema AS schema, column_name AS name, data_type AS type,
 			is_nullable AS null, column_default AS default,
 			character_maximum_length AS char_length,
 			d.description as comment,
@@ -74,10 +51,10 @@ class PostgresSchema extends BaseSchema {
 		LEFT JOIN pg_catalog.pg_index i ON (i.indrelid = cl.oid AND i.indkey[0] = c.ordinal_position)
 		LEFT JOIN pg_catalog.pg_description d on (cl.oid = d.objoid AND d.objsubid = c.ordinal_position)
 		WHERE table_name = ? AND table_schema = ? AND table_catalog = ?
-		ORDER BY ordinal_position";
+		ORDER BY ordinal_position';
 
 		$schema = empty($config['schema']) ? 'public' : $config['schema'];
-		return [$sql, [$table, $schema, $config['database']]];
+		return [$sql, [$name, $schema, $config['database']]];
 	}
 
 /**
@@ -90,7 +67,7 @@ class PostgresSchema extends BaseSchema {
  * @throws Cake\Database\Exception when column cannot be parsed.
  * @return array Array of column information.
  */
-	public function convertColumn($column) {
+	protected function _convertColumn($column) {
 		preg_match('/([a-z\s]+)(?:\(([0-9,]+)\))?/i', $column, $matches);
 		if (empty($matches)) {
 			throw new Exception(__d('cake_dev', 'Unable to parse column type from "%s"', $column));
@@ -149,14 +126,11 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Convert field description results into abstract schema fields.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object to append fields to.
- * @param array $row The row data from describeTableSql
- * @return void
  */
 	public function convertFieldDescription(Table $table, $row) {
-		$field = $this->convertColumn($row['type']);
+		$field = $this->_convertColumn($row['type']);
 
 		if ($field['type'] === 'boolean') {
 			if ($row['default'] === 'true') {
@@ -177,14 +151,11 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Get the SQL to describe the indexes in a table.
+ * {@inheritdoc}
  *
- * @param string $table The table name to get information on.
- * @param array $config The configuration containing the schema name.
- * @return array An array of (sql, params) to execute.
  */
 	public function describeIndexSql($table, $config) {
-		$sql = "SELECT
+		$sql = 'SELECT
 			c2.relname,
 			i.indisprimary,
 			i.indisunique,
@@ -203,7 +174,7 @@ class PostgresSchema extends BaseSchema {
 		)
 		AND c.oid = i.indrelid
 		AND i.indexrelid = c2.oid
-		ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname";
+		ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname';
 
 		$schema = 'public';
 		if (!empty($config['schema'])) {
@@ -213,12 +184,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Convert an index into the abstract description.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object to append
- *    an index or constraint to.
- * @param array $row The row data from describeIndexSql
- * @return void
  */
 	public function convertIndexDescription(Table $table, $row) {
 		$type = Table::INDEX_INDEX;
@@ -245,12 +212,11 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to describe the foreign keys on a table.
+ * {@inheritdoc}
  *
- * @return array List of sql, params
  */
-	public function describeForeignKeySql($table, $config = []) {
-		$sql = "SELECT
+	public function describeForeignKeySql($table, $config) {
+		$sql = 'SELECT
 			r.conname AS name,
 			r.confupdtype AS update_type,
 			r.confdeltype AS delete_type,
@@ -264,19 +230,17 @@ class PostgresSchema extends BaseSchema {
 				AND n.nspname = ?
 				AND n.oid = c.relnamespace
 			)
-			AND r.contype = 'f'";
+			AND r.contype = "f"';
+
 		$schema = empty($config['schema']) ? 'public' : $config['schema'];
 		return [$sql, [$table, $schema]];
 	}
 
 /**
- * Convert a foreign key description into constraints on the Table object.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Table $table The table instance to populate.
- * @param array $row The row of data.
- * @return void
  */
-	public function convertForeignKey(Table $table, $row) {
+	public function convertForeignKeyDescription(Table $table, $row) {
 		preg_match('/REFERENCES ([^\)]+)\(([^\)]+)\)/', $row['definition'], $matches);
 		$tableName = $matches[1];
 		$column = $matches[2];
@@ -296,10 +260,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Convert Postgres on clauses to the abstract ones.
+ * {@inheritdoc}
  *
- * @param string $clause
- * @return string|null
  */
 	protected function _convertOnClause($clause) {
 		if ($clause === 'r') {
@@ -315,11 +277,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single column.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function columnSql(Table $table, $name) {
 		$data = $table->column($name);
@@ -389,11 +348,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single index
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function indexSql(Table $table, $name) {
 		$data = $table->index($name);
@@ -409,11 +365,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single constraint
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function constraintSql(Table $table, $name) {
 		$data = $table->constraint($name);
@@ -453,13 +406,8 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to create a table.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table Table instance.
- * @param array $columns The columns to go inside the table.
- * @param array $constraints The constraints for the table.
- * @param array $indexes The indexes for the table.
- * @return string Complete CREATE TABLE statement
  */
 	public function createTableSql(Table $table, $columns, $constraints, $indexes) {
 		$content = array_merge($columns, $constraints);
@@ -484,15 +432,13 @@ class PostgresSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to truncate a table.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table Table instance
- * @return array SQL statements to drop truncate a table.
  */
 	public function truncateTableSql(Table $table) {
 		$name = $this->_driver->quoteIdentifier($table->name());
 		return [
-			sprintf("TRUNCATE %s RESTART IDENTITY", $name)
+			sprintf('TRUNCATE %s RESTART IDENTITY', $name)
 		];
 	}
 

Cake/Database/Schema/SqliteSchema.php

@@ -25,23 +25,6 @@ use Cake\Database\Schema\Table;
 class SqliteSchema extends BaseSchema {
 
 /**
- * The driver instance being used.
- *
- * @var Cake\Database\Driver\Sqlite
- */
-	protected $_driver;
-
-/**
- * Constructor
- *
- * @param Cake\Database\Driver\Sqlite $driver Driver to use.
- * @return void
- */
-	public function __construct($driver) {
-		$this->_driver = $driver;
-	}
-
-/**
  * Convert a column definition to the abstract types.
  *
  * The returned type will be a type that
@@ -51,7 +34,7 @@ class SqliteSchema extends BaseSchema {
  * @throws Cake\Database\Exception
  * @return array Array of column information.
  */
-	public function convertColumn($column) {
+	protected function _convertColumn($column) {
 		preg_match('/([a-z]+)(?:\(([0-9,]+)\))?/i', $column, $matches);
 		if (empty($matches)) {
 			throw new Exception(__d('cake_dev', 'Unable to parse column type from "%s"', $column));
@@ -94,34 +77,31 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Get the SQL to list the tables in Sqlite
+ * {@inheritdoc}
  *
- * @param array $config The connection configuration to use for
- *    getting tables from.
- * @return array An array of (sql, params) to execute.
  */
-	public function listTablesSql() {
-		return ["SELECT name FROM sqlite_master WHERE type='table' ORDER BY name", []];
+	public function listTablesSql($config) {
+		return ['SELECT name FROM sqlite_master WHERE type="table" ORDER BY name', []];
 	}
 
 /**
- * Get the SQL to describe a table in Sqlite.
+ * {@inheritdoc}
  *
- * @param string $table The table name to describe
- * @return array An array of (sql, params) to execute.
  */
-	public function describeTableSql($table) {
-		return ["PRAGMA table_info(" . $this->_driver->quoteIdentifier($table) . ")", []];
+	public function describeTableSql($name, $config) {
+		$sql = sprintf(
+			'PRAGMA table_info(%s)',
+			$this->_driver->quoteIdentifier($name)
+		);
+		return [$sql, []];
 	}
 
 /**
- * Convert field description results into abstract schema fields.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object to append fields to.
- * @param array $row The row data from describeTableSql
  */
 	public function convertFieldDescription(Table $table, $row) {
-		$field = $this->convertColumn($row['type']);
+		$field = $this->_convertColumn($row['type']);
 		$field += [
 			'null' => !$row['notnull'],
 			'default' => $row['dflt_value'] === null ? null : trim($row['dflt_value'], "'"),
@@ -139,12 +119,10 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Get the SQL to describe the indexes in a table.
+ * {@inheritdoc}
  *
- * @param string $table The table name to get information on.
- * @return array An array of (sql, params) to execute.
  */
-	public function describeIndexSql($table) {
+	public function describeIndexSql($table, $config) {
 		$sql = sprintf(
 			'PRAGMA index_list(%s)',
 			$this->_driver->quoteIdentifier($table)
@@ -153,17 +131,13 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Convert an index into the abstract description.
+ * {@inheritdoc}
  *
  * Since SQLite does not have a way to get metadata about all indexes at once,
  * additional queries are done here. Sqlite constraint names are not
  * stable, and the names for constraints will not match those used to create
  * the table. This is a limitation in Sqlite's metadata features.
  *
- * @param Cake\Database\Schema\Table $table The table object to append
- *    an index or constraint to.
- * @param array $row The row data from describeIndexSql
- * @return void
  */
 	public function convertIndexDescription(Table $table, $row) {
 		$sql = sprintf(
@@ -190,23 +164,19 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to describe the foreign keys on a table.
+ * {@inheritdoc}
  *
- * @return array List of sql, params
  */
-	public function describeForeignKeySql($table) {
+	public function describeForeignKeySql($table, $config) {
 		$sql = sprintf('PRAGMA foreign_key_list(%s)', $this->_driver->quoteIdentifier($table));
 		return [$sql, []];
 	}
 
 /**
- * Convert a foreign key description into constraints on the Table object.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Table $table The table instance to populate.
- * @param array $row The row of data.
- * @return void
  */
-	public function convertForeignKey(Table $table, $row) {
+	public function convertForeignKeyDescription(Table $table, $row) {
 		$data = [
 			'type' => Table::CONSTRAINT_FOREIGN,
 			'columns' => [$row['from']],
@@ -219,12 +189,8 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single column in Sqlite
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
- * @throws Cake\Database\Exception On unknown column types.
  */
 	public function columnSql(Table $table, $name) {
 		$data = $table->column($name);
@@ -277,14 +243,11 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragments for defining table constraints.
+ * {@inheritdoc}
  *
  * Note integer primary keys will return ''. This is intentional as Sqlite requires
  * that integer primary keys be defined in the column definition.
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function constraintSql(Table $table, $name) {
 		$data = $table->constraint($name);
@@ -325,11 +288,8 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL fragment for a single index.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table The table object the column is in.
- * @param string $name The name of the column.
- * @return string SQL fragment.
  */
 	public function indexSql(Table $table, $name) {
 		$data = $table->index($name);
@@ -345,15 +305,10 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to create a table.
+ * {@inheritdoc}
  *
- * @param Table $table Cake\Database\Schema\Table instance
- * @param array $columns The columns to go inside the table.
- * @param array $constraints The constraints for the table.
- * @param array $indexes The indexes for the table.
- * @return array Complete CREATE TABLE statement(s)S
  */
-	public function createTableSql($table, $columns, $constraints, $indexes) {
+	public function createTableSql(Table $table, $columns, $constraints, $indexes) {
 		$lines = array_merge($columns, $constraints);
 		$content = implode(",\n", array_filter($lines));
 		$table = sprintf("CREATE TABLE \"%s\" (\n%s\n)", $table->name(), $content);
@@ -365,10 +320,8 @@ class SqliteSchema extends BaseSchema {
 	}
 
 /**
- * Generate the SQL to truncate a table.
+ * {@inheritdoc}
  *
- * @param Cake\Database\Schema\Table $table Table instance
- * @return array SQL statements to drop truncate a table.
  */
 	public function truncateTableSql(Table $table) {
 		$name = $table->name();

Cake/Database/Schema/Table.php

@@ -118,6 +118,18 @@ class Table {
 		self::CONSTRAINT_FOREIGN,
 	];
 
+/**
+ * Names of the valid foreign key actions.
+ *
+ * @var array
+ */
+	protected $_validForeignKeyActions = [
+		self::ACTION_CASCADE,
+		self::ACTION_SET_NULL,
+		self::ACTION_NO_ACTION,
+		self::ACTION_RESTRICT,
+	];
+
 	const CONSTRAINT_PRIMARY = 'primary';
 	const CONSTRAINT_UNIQUE = 'unique';
 	const CONSTRAINT_FOREIGN = 'foreign';
@@ -358,12 +370,11 @@ class Table {
 		if (count($attrs['references']) < 2) {
 			throw new Exception(__d('cake_dev', 'References must contain a table and column.'));
 		}
-		$validActions = [static::ACTION_CASCADE, static::ACTION_RESTRICT, static::ACTION_SET_NULL, static::ACTION_NO_ACTION];
-		if (!in_array($attrs['update'], $validActions)) {
-			throw new Exception(__d('cake_dev', 'Update action is invalid. Must be one of %s', implode(',', $validActions)));
+		if (!in_array($attrs['update'], $this->_validForeignKeyActions)) {
+			throw new Exception(__d('cake_dev', 'Update action is invalid. Must be one of %s', implode(',', $this->_validForeignKeyActions)));
 		}
-		if (!in_array($attrs['delete'], $validActions)) {
-			throw new Exception(__d('cake_dev', 'Delete action is invalid. Must be one of %s', implode(',', $validActions)));
+		if (!in_array($attrs['delete'], $this->_validForeignKeyActions)) {
+			throw new Exception(__d('cake_dev', 'Delete action is invalid. Must be one of %s', implode(',', $this->_validForeignKeyActions)));
 		}
 		return $attrs;
 	}

Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php

@@ -39,11 +39,11 @@ class MysqlSchemaTest extends TestCase {
 	}
 
 /**
- * Dataprovider for column testing
+ * Data provider for convert column testing
  *
  * @return array
  */
-	public static function columnProvider() {
+	public static function convertColumnProvider() {
 		return [
 			[
 				'DATETIME',
@@ -117,15 +117,34 @@ class MysqlSchemaTest extends TestCase {
 	}
 
 /**
- * Test parsing MySQL column types.
+ * Test parsing MySQL column types form field description.
  *
- * @dataProvider columnProvider
+ * @dataProvider convertColumnProvider
  * @return void
  */
-	public function testConvertColumnType($input, $expected) {
+	public function testConvertColumn($type, $expected) {
+		$field = [
+			'Field' => 'field',
+			'Type' => $type,
+			'Null' => 'YES',
+			'Default' => 'Default value',
+			'Collation' => 'Collate information',
+			'Comment' => 'Comment section',
+		];
+		$expected += [
+			'null' => true,
+			'default' => 'Default value',
+			'collate' => 'Collate information',
+			'comment' => 'Comment section',
+		];
+
 		$driver = $this->getMock('Cake\Database\Driver\Mysql');
 		$dialect = new MysqlSchema($driver);
-		$this->assertEquals($expected, $dialect->convertColumn($input));
+
+		$table = $this->getMock('Cake\Database\Schema\Table', [], ['table']);
+		$table->expects($this->at(0))->method('addColumn')->with('field', $expected);
+
+		$dialect->convertFieldDescription($table, $field);
 	}
 
 /**

Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php

@@ -70,7 +70,7 @@ published BOOLEAN DEFAULT false,
 views SMALLINT DEFAULT 0,
 created TIMESTAMP,
 CONSTRAINT "content_idx" UNIQUE ("title", "body"),
-CONSTRAINT "author_idx" FOREIGN KEY ("author_id") REFERENCES "schema_authors" ("id") ON DELETE RESTRICT ON UPDATE CASCADE 
+CONSTRAINT "author_idx" FOREIGN KEY ("author_id") REFERENCES "schema_authors" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
 )
 SQL;
 		$connection->execute($table);
@@ -79,11 +79,11 @@ SQL;
 	}
 
 /**
- * Dataprovider for column testing
+ * Data provider for convert column testing
  *
  * @return array
  */
-	public static function columnProvider() {
+	public static function convertColumnProvider() {
 		return [
 			[
 				'TIMESTAMP',
@@ -185,15 +185,33 @@ SQL;
 	}
 
 /**
- * Test parsing Postgres column types.
+ * Test parsing Postgres column types from field description.
  *
- * @dataProvider columnProvider
+ * @dataProvider convertColumnProvider
  * @return void
  */
-	public function testConvertColumnType($input, $expected) {
+	public function testConvertColumn($type, $expected) {
+		$field = [
+			'name' => 'field',
+			'type' => $type,
+			'null' => 'YES',
+			'default' => 'Default value',
+			'comment' => 'Comment section',
+			'char_length' => null,
+		];
+		$expected += [
+			'null' => true,
+			'default' => 'Default value',
+			'comment' => 'Comment section',
+		];
+
 		$driver = $this->getMock('Cake\Database\Driver\Postgres');
 		$dialect = new PostgresSchema($driver);
-		$this->assertEquals($expected, $dialect->convertColumn($input));
+
+		$table = $this->getMock('Cake\Database\Schema\Table', [], ['table']);
+		$table->expects($this->at(0))->method('addColumn')->with('field', $expected);
+
+		$dialect->convertFieldDescription($table, $field);
 	}
 
 /**

Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php

@@ -39,11 +39,11 @@ class SqliteSchemaTest extends TestCase {
 	}
 
 /**
- * Dataprovider for column testing
+ * Data provider for convert column testing
  *
  * @return array
  */
-	public static function columnProvider() {
+	public static function convertColumnProvider() {
 		return [
 			[
 				'DATETIME',
@@ -109,15 +109,31 @@ class SqliteSchemaTest extends TestCase {
 	}
 
 /**
- * Test parsing SQLite column types.
+ * Test parsing SQLite column types from field description.
  *
- * @dataProvider columnProvider
+ * @dataProvider convertColumnProvider
  * @return void
  */
-	public function testConvertColumnType($input, $expected) {
+	public function testConvertColumn($type, $expected) {
+		$field = [
+			'pk' => false,
+			'name' => 'field',
+			'type' => $type,
+			'notnull' => false,
+			'dflt_value' => 'Default value',
+		];
+		$expected += [
+			'null' => true,
+			'default' => 'Default value',
+		];
+
 		$driver = $this->getMock('Cake\Database\Driver\Sqlite');
 		$dialect = new SqliteSchema($driver);
-		$this->assertEquals($expected, $dialect->convertColumn($input));
+
+		$table = $this->getMock('Cake\Database\Schema\Table', [], ['table']);
+		$table->expects($this->at(0))->method('addColumn')->with('field', $expected);
+
+		$dialect->convertFieldDescription($table, $field);
 	}
 
 /**