Skip to content

Y
yii2
Commit 92fe7e47 by Qiang Xue
Options

w

parent 3e18a7a6
Showing with 252 additions and 199 deletions
framework/db/dao/ColumnSchema.php
......@@ -8,13 +8,15 @@
* @license http://www.yiiframework.com/license/
*/
namespace yii\db\dao;
/**
* ColumnSchema class describes the column meta data of a database table.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class ColumnSchema extends CComponent
class ColumnSchema extends \yii\base\Component
{
/**
* @var string name of this column (without quotes).
......@@ -30,7 +32,7 @@ class ColumnSchema extends CComponent
public $allowNull;
/**
* @var string logical type of this column. Possible logic types include:
* string, text, boolean, integer, float, decimal, datetime, timestamp, time, date, binary
* string, text, boolean, smallint, integer, bigint, float, decimal, datetime, timestamp, time, date, binary
*/
public $type;
/**
......@@ -47,6 +49,10 @@ class ColumnSchema extends CComponent
*/
public $defaultValue;
/**
* @var array enumerable values
*/
public $enumValues;
/**
* @var integer size of the column.
*/
public $size;
......@@ -63,69 +69,37 @@ class ColumnSchema extends CComponent
*/
public $isPrimaryKey;
/**
* @var boolean whether this column is a foreign key
*/
public $isForeignKey;
/**
* @var boolean whether this column is auto-incremental
*/
public $autoIncrement = false;
/**
* Initializes the column with its DB type and default value.
* This sets up the column's PHP type, size, precision, scale as well as default value.
* @param string $dbType the column's DB type
* @param mixed $defaultValue the default value
* @var boolean whether this column is unsigned. This is only meaningful
* when [[type]] is `integer` or `bigint`.
*/
public function init($dbType, $defaultValue)
{
$this->dbType = $dbType;
$this->extractType($dbType);
$this->extractLimit($dbType);
if ($defaultValue !== null)
$this->extractDefault($defaultValue);
}
public $unsigned;
/**
* Extracts the PHP type from DB type.
* @param string $dbType DB type
*/
protected function extractType($dbType)
{
if (stripos($dbType, 'int') !== false && stripos($dbType, 'unsigned int') === false)
$this->type = 'integer';
elseif (stripos($dbType, 'bool') !== false)
$this->type = 'boolean';
elseif (preg_match('/(real|floa|doub)/i', $dbType))
$this->type = 'double';
else
$this->type = 'string';
}
/**
* Extracts size, precision and scale information from column's DB type.
* @param string $dbType the column's DB type
*/
protected function extractLimit($dbType)
protected function getPhpType()
{
if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches))
{
$values = explode(',', $matches[1]);
$this->size = $this->precision = (int)$values[0];
if (isset($values[1]))
$this->scale = (int)$values[1];
static $typeMap = array( // logical type => php type
'smallint' => 'integer',
'integer' => 'integer',
'bigint' => 'integer',
'boolean' => 'boolean',
'float' => 'double',
);
if (isset($typeMap[$this->type])) {
if ($this->type === 'bigint') {
return PHP_INT_SIZE == 8 && !$this->unsigned ? 'integer' : 'string';
}
elseif ($this->type === 'integer') {
return PHP_INT_SIZE == 4 && $this->unsigned ? 'string' : 'integer';
}
return $typeMap[$this->type];
}
}
/**
* Extracts the default value for the column.
* The value is typecasted to correct PHP type.
* @param mixed $defaultValue the default value obtained from metadata
*/
protected function extractDefault($defaultValue)
{
$this->defaultValue = $this->typecast($defaultValue);
return 'string';
}
/**
......@@ -135,17 +109,14 @@ class ColumnSchema extends CComponent
*/
public function typecast($value)
{
if (gettype($value) === $this->type || $value === null || $value instanceof CDbExpression)
if ($value === null || gettype($value) === $this->phpType || $value instanceof Expression) {
return $value;
if ($value === '')
return $this->type === 'string' ? '' : null;
switch ($this->type)
{
}
switch ($this->phpType) {
case 'string': return (string)$value;
case 'integer': return (integer)$value;
case 'boolean': return (boolean)$value;
case 'double':
default: return $value;
}
return $value;
}
}
framework/db/dao/QueryBuilder.php
......@@ -151,7 +151,7 @@ class QueryBuilder extends \yii\base\Component
public function dropColumn($table, $column)
{
return "ALTER TABLE " . $this->quoteTableName($table)
. " DROP COLUMN " . $this->quoteColumnName($column);
. " DROP COLUMN " . $this->quoteSimpleColumnName($column);
}
/**
......@@ -165,8 +165,8 @@ class QueryBuilder extends \yii\base\Component
public function renameColumn($table, $name, $newName)
{
return "ALTER TABLE " . $this->quoteTableName($table)
. " RENAME COLUMN " . $this->quoteColumnName($name)
. " TO " . $this->quoteColumnName($newName);
. " RENAME COLUMN " . $this->quoteSimpleColumnName($name)
. " TO " . $this->quoteSimpleColumnName($newName);
}
/**
......@@ -181,8 +181,8 @@ class QueryBuilder extends \yii\base\Component
public function alterColumn($table, $column, $type)
{
return 'ALTER TABLE ' . $this->quoteTableName($table) . ' CHANGE '
. $this->quoteColumnName($column) . ' '
. $this->quoteColumnName($column) . ' '
. $this->quoteSimpleColumnName($column) . ' '
. $this->quoteSimpleColumnName($column) . ' '
. $this->getColumnType($type);
}
......
framework/db/dao/Schema.php
......@@ -18,18 +18,18 @@ namespace yii\db\dao;
*/
abstract class Schema extends \yii\base\Component
{
public $connection;
private $_tableNames = array();
private $_tables = array();
private $_connection;
private $_builder;
private $_cacheExclude = array();
/**
* Loads the metadata for the specified table.
* @param string $name table name
* @return CDbTableSchema driver dependent table metadata, null if the table does not exist.
* @return TableSchema driver dependent table metadata, null if the table does not exist.
*/
abstract protected function loadTable($name);
abstract protected function loadTableSchema($name);
/**
* Constructor.
......@@ -37,17 +37,7 @@ abstract class Schema extends \yii\base\Component
*/
public function __construct($connection)
{
$this->_connection = $connection;
foreach ($connection->schemaCachingExclude as $name)
$this->_cacheExclude[$name] = true;
}
/**
* @return Connection database connection. The connection is active.
*/
public function getConnection()
{
return $this->_connection;
$this->connection = $connection;
}
/**
......@@ -62,13 +52,13 @@ abstract class Schema extends \yii\base\Component
}
if (strpos($name, '{{') !== false) {
$realName = preg_replace('/\{\{(.*?)\}\}/', $this->_connection->tablePrefix . '$1', $name);
$realName = preg_replace('/\{\{(.*?)\}\}/', $this->connection->tablePrefix . '$1', $name);
}
else {
$realName = $name;
}
$db = $this->_connection;
$db = $this->connection;
// temporarily disable query caching
if ($db->queryCachingDuration >= 0) {
......@@ -77,7 +67,7 @@ abstract class Schema extends \yii\base\Component
}
if (!in_array($name, $db->schemaCachingExclude) && $db->schemaCachingDuration >= 0 && ($cache = \Yii::app()->getComponent($db->schemaCacheID)) !== null) {
$key = __CLASS__ . ":{$db->dsn}/{$db->username}/{$name}";
$key = __CLASS__ . "/{$db->dsn}/{$db->username}/{$name}";
if (($table = $cache->get($key)) === false) {
$table = $this->loadTableSchema($realName);
if ($table !== null) {
......@@ -102,15 +92,14 @@ abstract class Schema extends \yii\base\Component
* @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
* @return array the metadata for all tables in the database.
* Each array element is an instance of {@link CDbTableSchema} (or its child class).
* The array keys are table names.
*/
public function getTables($schema = '')
public function getTableSchemas($schema = '')
{
$tables = array();
foreach ($this->getTableNames($schema) as $name)
{
if (($table = $this->getTable($name)) !== null)
$tables[$name] = $table;
foreach ($this->getTableNames($schema) as $name) {
if (($table = $this->getTableSchema($name)) !== null) {
$tables[] = $table;
}
}
return $tables;
}
......@@ -123,20 +112,21 @@ abstract class Schema extends \yii\base\Component
*/
public function getTableNames($schema = '')
{
if (!isset($this->_tableNames[$schema]))
if (!isset($this->_tableNames[$schema])) {
$this->_tableNames[$schema] = $this->findTableNames($schema);
}
return $this->_tableNames[$schema];
}
/**
* @return CDbCommandBuilder the SQL command builder for this connection.
* @return QueryBuilder the query builder for this connection.
*/
public function getCommandBuilder()
public function getQueryBuilder()
{
if ($this->_builder !== null)
return $this->_builder;
else
return $this->_builder = $this->createCommandBuilder();
if ($this->_builder === null) {
$this->_builder = $this->createQueryBuilder();
}
return $this->_builder;
}
/**
......@@ -146,7 +136,7 @@ abstract class Schema extends \yii\base\Component
*/
public function refresh()
{
$db = $this->_connection;
$db = $this->connection;
if ($db->schemaCachingDuration >= 0 && ($cache = \Yii::app()->getComponent($db->schemaCacheID)) !== null) {
foreach ($this->_tables as $name => $table) {
$key = __CLASS__ . ":{$db->dsn}/{$db->username}/{$name}";
......@@ -155,7 +145,6 @@ abstract class Schema extends \yii\base\Component
}
$this->_tables = array();
$this->_tableNames = array();
$this->_builder = null;
}
/**
......@@ -167,11 +156,13 @@ abstract class Schema extends \yii\base\Component
*/
public function quoteTableName($name)
{
if (strpos($name, '.') === false)
if (strpos($name, '.') === false) {
return $this->quoteSimpleTableName($name);
}
$parts = explode('.', $name);
foreach ($parts as $i => $part)
foreach ($parts as $i => $part) {
$parts[$i] = $this->quoteSimpleTableName($part);
}
return implode('.', $parts);
}
......@@ -184,7 +175,7 @@ abstract class Schema extends \yii\base\Component
*/
public function quoteSimpleTableName($name)
{
return "'" . $name . "'";
return strpos($name, "'") !== false ? $name : "'" . $name . "'";
}
/**
......@@ -196,14 +187,13 @@ abstract class Schema extends \yii\base\Component
*/
public function quoteColumnName($name)
{
if (($pos = strrpos($name, '.')) !== false)
{
if (($pos = strrpos($name, '.')) !== false) {
$prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
$name = substr($name, $pos + 1);
}
else
$prefix = '';
return $prefix . ($name === '*' ? $name : $this->quoteSimpleColumnName($name));
return $prefix . $this->quoteSimpleColumnName($name);
}
/**
......@@ -211,45 +201,18 @@ abstract class Schema extends \yii\base\Component
* A simple column name does not contain prefix.
* @param string $name column name
* @return string the properly quoted column name
* @since 1.1.6
*/
public function quoteSimpleColumnName($name)
{
return '"' . $name . '"';
}
/**
* Compares two table names.
* The table names can be either quoted or unquoted. This method
* will consider both cases.
* @param string $name1 table name 1
* @param string $name2 table name 2
* @return boolean whether the two table names refer to the same table.
*/
public function compareTableNames($name1, $name2)
{
$name1 = str_replace(array('"', '`', "'"), '', $name1);
$name2 = str_replace(array('"', '`', "'"), '', $name2);
if (($pos = strrpos($name1, '.')) !== false)
$name1 = substr($name1, $pos + 1);
if (($pos = strrpos($name2, '.')) !== false)
$name2 = substr($name2, $pos + 1);
if ($this->_connection->tablePrefix !== null)
{
if (strpos($name1, '{') !== false)
$name1 = $this->_connection->tablePrefix . str_replace(array('{', '}'), '', $name1);
if (strpos($name2, '{') !== false)
$name2 = $this->_connection->tablePrefix . str_replace(array('{', '}'), '', $name2);
}
return $name1 === $name2;
return strpos($name, '"') !== false || $name === '*' ? $name : '"' . $name . '"';
}
/**
* Creates a command builder for the database.
* This method may be overridden by child classes to create a DBMS-specific command builder.
* @return CDbCommandBuilder command builder instance
* Creates a query builder for the database.
* This method may be overridden by child classes to create a DBMS-specific query builder.
* @return QueryBuilder query builder instance
*/
protected function createQueryBuilder()
public function createQueryBuilder()
{
return new QueryBuilder($this);
}
......
framework/db/dao/TableSchema.php
......@@ -39,7 +39,7 @@ class TableSchema extends \yii\base\Component
*/
public $name;
/**
* @var string quoted name of this table. This may include [[schemaName]] if it is not empty.
* @var string quoted name of this table. This will include [[schemaName]] if it is not empty.
*/
public $quotedName;
/**
......@@ -51,7 +51,15 @@ class TableSchema extends \yii\base\Component
*/
public $sequenceName;
/**
* @var array foreign keys of this table. The array is indexed by column name. Each value is an array of foreign table name and foreign column name.
* @var array foreign keys of this table. Each array element is of the following structure:
*
* ~~~
* array(
* 'ForeignTableName',
* 'fk1' => 'pk1', // pk1 is in foreign table
* 'fk2' => 'pk2', // if composite foreign key
* )
* ~~~
*/
public $foreignKeys = array();
/**
......
framework/db/dao/mysql/ColumnSchema.php
......@@ -8,6 +8,8 @@
* @license http://www.yiiframework.com/license/
*/
namespace yii\db\dao\mysql;
/**
* ColumnSchema class describes the column meta data of a MySQL table.
*
......@@ -20,18 +22,76 @@ class ColumnSchema extends \yii\db\dao\ColumnSchema
* Extracts the PHP type from DB type.
* @param string $dbType DB type
*/
protected function extractType($dbType)
public function initTypes($dbType)
{
if (strncmp($dbType, 'enum', 4) === 0)
$this->type = 'string';
elseif (strpos($dbType, 'float') !== false || strpos($dbType, 'double') !== false)
$this->type = 'double';
elseif (strpos($dbType, 'bool') !== false)
$this->type = 'boolean';
elseif (strpos($dbType, 'int') === 0 && strpos($dbType, 'unsigned') === false || preg_match('/(bit|tinyint|smallint|mediumint)/', $dbType))
$this->type = 'integer';
else
$this->type = 'string';
static $typeMap = array( // dbType => type
'tinyint' => 'smallint',
'bit' => 'smallint',
'smallint' => 'smallint',
'mediumint' => 'integer',
'int' => 'integer',
'integer' => 'integer',
'bigint' => 'bigint',
'float' => 'float',
'double' => 'float',
'real' => 'float',
'decimal' => 'decimal',
'numeric' => 'decimal',
'tinytext' => 'text',
'mediumtext' => 'text',
'longtext' => 'text',
'text' => 'text',
'varchar' => 'string',
'string' => 'string',
'char' => 'string',
'datetime' => 'datetime',
'year' => 'date',
'date' => 'date',
'time' => 'time',
'timestamp' => 'timestamp',
'enum' => 'enum',
);
$this->dbType = $dbType;
$this->type = 'string';
$this->unsigned = strpos($this->dbType, 'unsigned') !== false;
if (preg_match('/^(\w+)(?:\(([^\)]+)\))?/', $this->dbType, $matches)) {
$type = $matches[1];
if (isset($typeMap[$type])) {
$this->type = $typeMap[$type];
}
if (!empty($matches[2])) {
if ($this->type === 'enum') {
$values = explode(',', $matches[2]);
foreach ($values as $i => $value) {
$values[$i] = trim($value, "'");
}
$this->enumValues = $values;
}
else {
$values = explode(',', $matches[2]);
$this->size = $this->precision = (int)$values[0];
if (isset($values[1])) {
$this->scale = (int)$values[1];
}
if ($this->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
$this->type = 'boolean';
}
elseif ($type === 'bit') {
if ($this->size > 32) {
$this->type = 'bigint';
}
elseif ($this->size === 32) {
$this->type = 'integer';
}
}
}
}
}
$this->phpType = $this->getPhpType();
}
/**
......@@ -39,32 +99,13 @@ class ColumnSchema extends \yii\db\dao\ColumnSchema
* The value is typecasted to correct PHP type.
* @param mixed $defaultValue the default value obtained from metadata
*/
protected function extractDefault($defaultValue)
public function initDefaultValue($defaultValue)
{
if ($this->dbType === 'timestamp' && $defaultValue === 'CURRENT_TIMESTAMP')
if ($this->type === 'timestamp' && $defaultValue === 'CURRENT_TIMESTAMP') {
$this->defaultValue = null;
else
parent::extractDefault($defaultValue);
}
/**
* Extracts size, precision and scale information from column's DB type.
* @param string $dbType the column's DB type
*/
protected function extractLimit($dbType)
{
if (strncmp($dbType, 'enum', 4) === 0 && preg_match('/\((.*)\)/', $dbType, $matches))
{
$values = explode(',', $matches[1]);
$size = 0;
foreach ($values as $value)
{
if (($n = strlen($value)) > $size)
$size = $n;
}
$this->size = $this->precision = $size-2;
}
else
parent::extractLimit($dbType);
else {
$this->defaultValue = $this->typecast($defaultValue);
}
}
}
\ No newline at end of file
framework/db/dao/mysql/QueryBuilder.php 0 → 100644
<?php
/**
* QueryBuilder class file.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008-2012 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\db\dao\mysql;
/**
* QueryBuilder builds a SQL statement based on the specification given as a [[Query]] object.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class QueryBuilder extends \yii\db\dao\QueryBuilder
{
/**
* @var array the abstract column types mapped to physical column types.
*/
public $columnTypes = array(
'pk' => 'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY',
'string' => 'varchar(255)',
'text' => 'text',
'smallint' => 'smallint',
'integer' => 'int(11)',
'bigint'=> 'bigint',
'boolean' => 'tinyint(1)',
'float' => 'float',
'decimal' => 'decimal',
'money' => 'decimal(19,4)',
'datetime' => 'datetime',
'timestamp' => 'timestamp',
'time' => 'time',
'date' => 'date',
'binary' => 'blob',
);
/**
* Builds a SQL statement for renaming a column.
* @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
* @param string $name the old name of the column. The name will be properly quoted by the method.
* @param string $newName the new name of the column. The name will be properly quoted by the method.
* @return string the SQL statement for renaming a DB column.
* @since 1.1.6
*/
public function renameColumn($table, $name, $newName)
{
$db = $this->getDbConnection();
$row = $db->createCommand('SHOW CREATE TABLE ' . $db->quoteTableName($table))->queryRow();
if ($row === false)
throw new CDbException(Yii::t('yii', 'Unable to find "{column}" in table "{table}".', array('{column}' => $name, '{table}' => $table)));
if (isset($row['Create Table']))
$sql = $row['Create Table'];
else
{
$row = array_values($row);
$sql = $row[1];
}
if (preg_match_all('/^\s*`(.*?)`\s+(.*?),?$/m', $sql, $matches))
{
foreach ($matches[1] as $i => $c)
{
if ($c === $name)
{
return "ALTER TABLE " . $db->quoteTableName($table)
. " CHANGE " . $db->quoteColumnName($name)
. ' ' . $db->quoteColumnName($newName) . ' ' . $matches[2][$i];
}
}
}
// try to give back a SQL anyway
return "ALTER TABLE " . $db->quoteTableName($table)
. " CHANGE " . $db->quoteColumnName($name) . ' ' . $newName;
}
/**
* Builds a SQL statement for dropping a foreign key constraint.
* @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
* @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
* @return string the SQL statement for dropping a foreign key constraint.
* @since 1.1.6
*/
public function dropForeignKey($name, $table)
{
return 'ALTER TABLE ' . $this->quoteTableName($table)
. ' DROP FOREIGN KEY ' . $this->quoteColumnName($name);
}
}
framework/db/dao/mysql/TableSchema.php deleted 100644 → 0
<?php
/**
* TableSchema class file.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.yiiframework.com/
* @copyright Copyright &copy; 2008-2012 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
/**
* TableSchema represents the metadata for a MySQL table.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0
*/
class TableSchema extends CDbTableSchema
{
/**
* @var string name of the schema (database) that this table belongs to.
* Defaults to null, meaning no schema (or the current database).
*/
public $schemaName;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment