mirror of
https://github.com/brmlab/brmsklad.git
synced 2025-10-30 15:53:59 +01:00
Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
Brm Ko
parent
5a580df460
commit
235a541597
793 changed files with 60746 additions and 23753 deletions
|
|
@ -2,19 +2,18 @@
|
|||
/**
|
||||
* MySQL layer for DBO
|
||||
*
|
||||
* PHP 5
|
||||
*
|
||||
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
|
||||
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
*
|
||||
* Licensed under The MIT License
|
||||
* For full copyright and license information, please see the LICENSE.txt
|
||||
* Redistributions of files must retain the above copyright notice.
|
||||
*
|
||||
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @link http://cakephp.org CakePHP(tm) Project
|
||||
* @package Cake.Model.Datasource.Database
|
||||
* @since CakePHP(tm) v 0.10.5.1790
|
||||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
* @license http://www.opensource.org/licenses/mit-license.php MIT License
|
||||
*/
|
||||
|
||||
App::uses('DboSource', 'Model/Datasource');
|
||||
|
|
@ -46,13 +45,14 @@ class Mysql extends DboSource {
|
|||
'login' => 'root',
|
||||
'password' => '',
|
||||
'database' => 'cake',
|
||||
'port' => '3306'
|
||||
'port' => '3306',
|
||||
'flags' => array()
|
||||
);
|
||||
|
||||
/**
|
||||
* Reference to the PDO object connection
|
||||
*
|
||||
* @var PDO $_connection
|
||||
* @var PDO
|
||||
*/
|
||||
protected $_connection = null;
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* use alias for update and delete. Set to true if version >= 4.1
|
||||
*
|
||||
* @var boolean
|
||||
* @var bool
|
||||
*/
|
||||
protected $_useAlias = true;
|
||||
|
||||
|
|
@ -85,7 +85,13 @@ class Mysql extends DboSource {
|
|||
public $fieldParameters = array(
|
||||
'charset' => array('value' => 'CHARACTER SET', 'quote' => false, 'join' => ' ', 'column' => false, 'position' => 'beforeDefault'),
|
||||
'collate' => array('value' => 'COLLATE', 'quote' => false, 'join' => ' ', 'column' => 'Collation', 'position' => 'beforeDefault'),
|
||||
'comment' => array('value' => 'COMMENT', 'quote' => true, 'join' => ' ', 'column' => 'Comment', 'position' => 'afterDefault')
|
||||
'comment' => array('value' => 'COMMENT', 'quote' => true, 'join' => ' ', 'column' => 'Comment', 'position' => 'afterDefault'),
|
||||
'unsigned' => array(
|
||||
'value' => 'UNSIGNED', 'quote' => false, 'join' => ' ', 'column' => false, 'position' => 'beforeDefault',
|
||||
'noVal' => true,
|
||||
'options' => array(true),
|
||||
'types' => array('integer', 'float', 'decimal', 'biginteger')
|
||||
)
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
@ -96,7 +102,8 @@ class Mysql extends DboSource {
|
|||
public $tableParameters = array(
|
||||
'charset' => array('value' => 'DEFAULT CHARSET', 'quote' => false, 'join' => '=', 'column' => 'charset'),
|
||||
'collate' => array('value' => 'COLLATE', 'quote' => false, 'join' => '=', 'column' => 'Collation'),
|
||||
'engine' => array('value' => 'ENGINE', 'quote' => false, 'join' => '=', 'column' => 'Engine')
|
||||
'engine' => array('value' => 'ENGINE', 'quote' => false, 'join' => '=', 'column' => 'Engine'),
|
||||
'comment' => array('value' => 'COMMENT', 'quote' => true, 'join' => '=', 'column' => 'Comment'),
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
@ -108,8 +115,10 @@ class Mysql extends DboSource {
|
|||
'primary_key' => array('name' => 'NOT NULL AUTO_INCREMENT'),
|
||||
'string' => array('name' => 'varchar', 'limit' => '255'),
|
||||
'text' => array('name' => 'text'),
|
||||
'biginteger' => array('name' => 'bigint', 'limit' => '20'),
|
||||
'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'),
|
||||
'float' => array('name' => 'float', 'formatter' => 'floatval'),
|
||||
'decimal' => array('name' => 'decimal', 'formatter' => 'floatval'),
|
||||
'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
|
||||
'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
|
||||
'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'),
|
||||
|
|
@ -118,29 +127,55 @@ class Mysql extends DboSource {
|
|||
'boolean' => array('name' => 'tinyint', 'limit' => '1')
|
||||
);
|
||||
|
||||
/**
|
||||
* Mapping of collation names to character set names
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $_charsets = array();
|
||||
|
||||
/**
|
||||
* Connects to the database using options in the given configuration array.
|
||||
*
|
||||
* @return boolean True if the database could be connected, else false
|
||||
* MySQL supports a few additional options that other drivers do not:
|
||||
*
|
||||
* - `unix_socket` Set to the path of the MySQL sock file. Can be used in place
|
||||
* of host + port.
|
||||
* - `ssl_key` SSL key file for connecting via SSL. Must be combined with `ssl_cert`.
|
||||
* - `ssl_cert` The SSL certificate to use when connecting via SSL. Must be
|
||||
* combined with `ssl_key`.
|
||||
* - `ssl_ca` The certificate authority for SSL connections.
|
||||
*
|
||||
* @return bool True if the database could be connected, else false
|
||||
* @throws MissingConnectionException
|
||||
*/
|
||||
public function connect() {
|
||||
$config = $this->config;
|
||||
$this->connected = false;
|
||||
|
||||
$flags = $config['flags'] + array(
|
||||
PDO::ATTR_PERSISTENT => $config['persistent'],
|
||||
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
|
||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
|
||||
);
|
||||
|
||||
if (!empty($config['encoding'])) {
|
||||
$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
|
||||
}
|
||||
if (!empty($config['ssl_key']) && !empty($config['ssl_cert'])) {
|
||||
$flags[PDO::MYSQL_ATTR_SSL_KEY] = $config['ssl_key'];
|
||||
$flags[PDO::MYSQL_ATTR_SSL_CERT] = $config['ssl_cert'];
|
||||
}
|
||||
if (!empty($config['ssl_ca'])) {
|
||||
$flags[PDO::MYSQL_ATTR_SSL_CA] = $config['ssl_ca'];
|
||||
}
|
||||
if (empty($config['unix_socket'])) {
|
||||
$dsn = "mysql:host={$config['host']};port={$config['port']};dbname={$config['database']}";
|
||||
} else {
|
||||
$dsn = "mysql:unix_socket={$config['unix_socket']};dbname={$config['database']}";
|
||||
}
|
||||
|
||||
try {
|
||||
$flags = array(
|
||||
PDO::ATTR_PERSISTENT => $config['persistent'],
|
||||
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
|
||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
|
||||
);
|
||||
if (!empty($config['encoding'])) {
|
||||
$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
|
||||
}
|
||||
if (empty($config['unix_socket'])) {
|
||||
$dsn = "mysql:host={$config['host']};port={$config['port']};dbname={$config['database']}";
|
||||
} else {
|
||||
$dsn = "mysql:unix_socket={$config['unix_socket']};dbname={$config['database']}";
|
||||
}
|
||||
$this->_connection = new PDO(
|
||||
$dsn,
|
||||
$config['login'],
|
||||
|
|
@ -148,6 +183,11 @@ class Mysql extends DboSource {
|
|||
$flags
|
||||
);
|
||||
$this->connected = true;
|
||||
if (!empty($config['settings'])) {
|
||||
foreach ($config['settings'] as $key => $value) {
|
||||
$this->_execute("SET $key=$value");
|
||||
}
|
||||
}
|
||||
} catch (PDOException $e) {
|
||||
throw new MissingConnectionException(array(
|
||||
'class' => get_class($this),
|
||||
|
|
@ -155,6 +195,7 @@ class Mysql extends DboSource {
|
|||
));
|
||||
}
|
||||
|
||||
$this->_charsets = array();
|
||||
$this->_useAlias = (bool)version_compare($this->getVersion(), "4.1", ">=");
|
||||
|
||||
return $this->connected;
|
||||
|
|
@ -163,7 +204,7 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* Check whether the MySQL extension is installed/loaded
|
||||
*
|
||||
* @return boolean
|
||||
* @return bool
|
||||
*/
|
||||
public function enabled() {
|
||||
return in_array('mysql', PDO::getAvailableDrivers());
|
||||
|
|
@ -172,12 +213,12 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* Returns an array of sources (tables) in the database.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param mixed $data List of tables.
|
||||
* @return array Array of table names in the database
|
||||
*/
|
||||
public function listSources($data = null) {
|
||||
$cache = parent::listSources();
|
||||
if ($cache != null) {
|
||||
if ($cache) {
|
||||
return $cache;
|
||||
}
|
||||
$result = $this->_execute('SHOW TABLES FROM ' . $this->name($this->config['database']));
|
||||
|
|
@ -185,23 +226,22 @@ class Mysql extends DboSource {
|
|||
if (!$result) {
|
||||
$result->closeCursor();
|
||||
return array();
|
||||
} else {
|
||||
$tables = array();
|
||||
|
||||
while ($line = $result->fetch(PDO::FETCH_NUM)) {
|
||||
$tables[] = $line[0];
|
||||
}
|
||||
|
||||
$result->closeCursor();
|
||||
parent::listSources($tables);
|
||||
return $tables;
|
||||
}
|
||||
$tables = array();
|
||||
|
||||
while ($line = $result->fetch(PDO::FETCH_NUM)) {
|
||||
$tables[] = $line[0];
|
||||
}
|
||||
|
||||
$result->closeCursor();
|
||||
parent::listSources($tables);
|
||||
return $tables;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a map of the columns contained in a result
|
||||
*
|
||||
* @param PDOStatement $results
|
||||
* @param PDOStatement $results The results to format.
|
||||
* @return void
|
||||
*/
|
||||
public function resultSet($results) {
|
||||
|
|
@ -211,10 +251,10 @@ class Mysql extends DboSource {
|
|||
|
||||
while ($numFields-- > 0) {
|
||||
$column = $results->getColumnMeta($index);
|
||||
if (empty($column['native_type'])) {
|
||||
$type = ($column['len'] == 1) ? 'boolean' : 'string';
|
||||
if ($column['len'] === 1 && (empty($column['native_type']) || $column['native_type'] === 'TINY')) {
|
||||
$type = 'boolean';
|
||||
} else {
|
||||
$type = $column['native_type'];
|
||||
$type = empty($column['native_type']) ? 'string' : $column['native_type'];
|
||||
}
|
||||
if (!empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
|
||||
$this->map[$index++] = array($column['table'], $column['name'], $type);
|
||||
|
|
@ -261,15 +301,24 @@ class Mysql extends DboSource {
|
|||
* @return string Character set name
|
||||
*/
|
||||
public function getCharsetName($name) {
|
||||
if ((bool)version_compare($this->getVersion(), "5", ">=")) {
|
||||
$r = $this->_execute('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME = ?', array($name));
|
||||
$cols = $r->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if (isset($cols['CHARACTER_SET_NAME'])) {
|
||||
return $cols['CHARACTER_SET_NAME'];
|
||||
}
|
||||
if ((bool)version_compare($this->getVersion(), "5", "<")) {
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
if (isset($this->_charsets[$name])) {
|
||||
return $this->_charsets[$name];
|
||||
}
|
||||
$r = $this->_execute(
|
||||
'SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME = ?',
|
||||
array($name)
|
||||
);
|
||||
$cols = $r->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if (isset($cols['CHARACTER_SET_NAME'])) {
|
||||
$this->_charsets[$name] = $cols['CHARACTER_SET_NAME'];
|
||||
} else {
|
||||
$this->_charsets[$name] = false;
|
||||
}
|
||||
return $this->_charsets[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -282,7 +331,7 @@ class Mysql extends DboSource {
|
|||
public function describe($model) {
|
||||
$key = $this->fullTableName($model, false);
|
||||
$cache = parent::describe($key);
|
||||
if ($cache != null) {
|
||||
if ($cache) {
|
||||
return $cache;
|
||||
}
|
||||
$table = $this->fullTableName($model);
|
||||
|
|
@ -298,8 +347,14 @@ class Mysql extends DboSource {
|
|||
'type' => $this->column($column->Type),
|
||||
'null' => ($column->Null === 'YES' ? true : false),
|
||||
'default' => $column->Default,
|
||||
'length' => $this->length($column->Type),
|
||||
'length' => $this->length($column->Type)
|
||||
);
|
||||
if (in_array($fields[$column->Field]['type'], $this->fieldParameters['unsigned']['types'], true)) {
|
||||
$fields[$column->Field]['unsigned'] = $this->_unsigned($column->Type);
|
||||
}
|
||||
if (in_array($fields[$column->Field]['type'], array('timestamp', 'datetime')) && strtoupper($column->Default) === 'CURRENT_TIMESTAMP') {
|
||||
$fields[$column->Field]['default'] = null;
|
||||
}
|
||||
if (!empty($column->Key) && isset($this->index[$column->Key])) {
|
||||
$fields[$column->Field]['key'] = $this->index[$column->Key];
|
||||
}
|
||||
|
|
@ -323,10 +378,10 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* Generates and executes an SQL UPDATE statement for given model, fields, and values.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param array $fields
|
||||
* @param array $values
|
||||
* @param mixed $conditions
|
||||
* @param Model $model The model to update.
|
||||
* @param array $fields The fields to update.
|
||||
* @param array $values The values to set.
|
||||
* @param mixed $conditions The conditions to use.
|
||||
* @return array
|
||||
*/
|
||||
public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
|
||||
|
|
@ -334,7 +389,7 @@ class Mysql extends DboSource {
|
|||
return parent::update($model, $fields, $values, $conditions);
|
||||
}
|
||||
|
||||
if ($values == null) {
|
||||
if (!$values) {
|
||||
$combined = $fields;
|
||||
} else {
|
||||
$combined = array_combine($fields, $values);
|
||||
|
|
@ -347,7 +402,7 @@ class Mysql extends DboSource {
|
|||
|
||||
if (!empty($conditions)) {
|
||||
$alias = $this->name($model->alias);
|
||||
if ($model->name == $model->alias) {
|
||||
if ($model->name === $model->alias) {
|
||||
$joins = implode(' ', $this->_getJoins($model));
|
||||
}
|
||||
}
|
||||
|
|
@ -367,9 +422,9 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* Generates and executes an SQL DELETE statement for given id/conditions on given model.
|
||||
*
|
||||
* @param Model $model
|
||||
* @param mixed $conditions
|
||||
* @return boolean Success
|
||||
* @param Model $model The model to delete from.
|
||||
* @param mixed $conditions The conditions to use.
|
||||
* @return bool Success
|
||||
*/
|
||||
public function delete(Model $model, $conditions = null) {
|
||||
if (!$this->_useAlias) {
|
||||
|
|
@ -382,13 +437,7 @@ class Mysql extends DboSource {
|
|||
if (empty($conditions)) {
|
||||
$alias = $joins = false;
|
||||
}
|
||||
$complexConditions = false;
|
||||
foreach ((array)$conditions as $key => $value) {
|
||||
if (strpos($key, $model->alias) === false) {
|
||||
$complexConditions = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$complexConditions = $this->_deleteNeedsComplexConditions($model, $conditions);
|
||||
if (!$complexConditions) {
|
||||
$joins = false;
|
||||
}
|
||||
|
|
@ -404,11 +453,32 @@ class Mysql extends DboSource {
|
|||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether complex conditions are needed for a delete with the given conditions.
|
||||
*
|
||||
* @param Model $model The model to delete from.
|
||||
* @param mixed $conditions The conditions to use.
|
||||
* @return bool Whether or not complex conditions are needed
|
||||
*/
|
||||
protected function _deleteNeedsComplexConditions(Model $model, $conditions) {
|
||||
$fields = array_keys($this->describe($model));
|
||||
foreach ((array)$conditions as $key => $value) {
|
||||
if (in_array(strtolower(trim($key)), $this->_sqlBoolOps, true)) {
|
||||
if ($this->_deleteNeedsComplexConditions($model, $value)) {
|
||||
return true;
|
||||
}
|
||||
} elseif (strpos($key, $model->alias) === false && !in_array($key, $fields, true)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the database encoding
|
||||
*
|
||||
* @param string $enc Database encoding
|
||||
* @return boolean
|
||||
* @return bool
|
||||
*/
|
||||
public function setEncoding($enc) {
|
||||
return $this->_execute('SET NAMES ' . $enc) !== false;
|
||||
|
|
@ -425,17 +495,22 @@ class Mysql extends DboSource {
|
|||
$table = $this->fullTableName($model);
|
||||
$old = version_compare($this->getVersion(), '4.1', '<=');
|
||||
if ($table) {
|
||||
$indices = $this->_execute('SHOW INDEX FROM ' . $table);
|
||||
$indexes = $this->_execute('SHOW INDEX FROM ' . $table);
|
||||
// @codingStandardsIgnoreStart
|
||||
// MySQL columns don't match the cakephp conventions.
|
||||
while ($idx = $indices->fetch(PDO::FETCH_OBJ)) {
|
||||
while ($idx = $indexes->fetch(PDO::FETCH_OBJ)) {
|
||||
if ($old) {
|
||||
$idx = (object)current((array)$idx);
|
||||
}
|
||||
if (!isset($index[$idx->Key_name]['column'])) {
|
||||
$col = array();
|
||||
$index[$idx->Key_name]['column'] = $idx->Column_name;
|
||||
$index[$idx->Key_name]['unique'] = intval($idx->Non_unique == 0);
|
||||
|
||||
if ($idx->Index_type === 'FULLTEXT') {
|
||||
$index[$idx->Key_name]['type'] = strtolower($idx->Index_type);
|
||||
} else {
|
||||
$index[$idx->Key_name]['unique'] = (int)($idx->Non_unique == 0);
|
||||
}
|
||||
} else {
|
||||
if (!empty($index[$idx->Key_name]['column']) && !is_array($index[$idx->Key_name]['column'])) {
|
||||
$col[] = $index[$idx->Key_name]['column'];
|
||||
|
|
@ -451,7 +526,7 @@ class Mysql extends DboSource {
|
|||
}
|
||||
}
|
||||
// @codingStandardsIgnoreEnd
|
||||
$indices->closeCursor();
|
||||
$indexes->closeCursor();
|
||||
}
|
||||
return $index;
|
||||
}
|
||||
|
|
@ -460,7 +535,7 @@ class Mysql extends DboSource {
|
|||
* Generate a MySQL Alter Table syntax for the given Schema comparison
|
||||
*
|
||||
* @param array $compare Result of a CakeSchema::compare()
|
||||
* @param string $table
|
||||
* @param string $table The table name.
|
||||
* @return array Array of alter statements to make.
|
||||
*/
|
||||
public function alterSchema($compare, $table = null) {
|
||||
|
|
@ -471,7 +546,7 @@ class Mysql extends DboSource {
|
|||
$colList = array();
|
||||
foreach ($compare as $curTable => $types) {
|
||||
$indexes = $tableParameters = $colList = array();
|
||||
if (!$table || $table == $curTable) {
|
||||
if (!$table || $table === $curTable) {
|
||||
$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
|
||||
foreach ($types as $type => $column) {
|
||||
if (isset($column['indexes'])) {
|
||||
|
|
@ -492,21 +567,25 @@ class Mysql extends DboSource {
|
|||
}
|
||||
$colList[] = $alter;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
case 'drop':
|
||||
foreach ($column as $field => $col) {
|
||||
$col['name'] = $field;
|
||||
$colList[] = 'DROP ' . $this->name($field);
|
||||
}
|
||||
break;
|
||||
break;
|
||||
case 'change':
|
||||
foreach ($column as $field => $col) {
|
||||
if (!isset($col['name'])) {
|
||||
$col['name'] = $field;
|
||||
}
|
||||
$colList[] = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
|
||||
$alter = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
|
||||
if (isset($col['after'])) {
|
||||
$alter .= ' AFTER ' . $this->name($col['after']);
|
||||
}
|
||||
$colList[] = $alter;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$colList = array_merge($colList, $this->_alterIndexes($curTable, $indexes));
|
||||
|
|
@ -518,21 +597,13 @@ class Mysql extends DboSource {
|
|||
}
|
||||
|
||||
/**
|
||||
* Generate a MySQL "drop table" statement for the given Schema object
|
||||
* Generate a "drop table" statement for the given table
|
||||
*
|
||||
* @param CakeSchema $schema An instance of a subclass of CakeSchema
|
||||
* @param string $table Optional. If specified only the table name given will be generated.
|
||||
* Otherwise, all tables defined in the schema are generated.
|
||||
* @return string
|
||||
* @param type $table Name of the table to drop
|
||||
* @return string Drop table SQL statement
|
||||
*/
|
||||
public function dropSchema(CakeSchema $schema, $table = null) {
|
||||
$out = '';
|
||||
foreach ($schema->tables as $curTable => $columns) {
|
||||
if (!$table || $table === $curTable) {
|
||||
$out .= 'DROP TABLE IF EXISTS ' . $this->fullTableName($curTable) . ";\n";
|
||||
}
|
||||
}
|
||||
return $out;
|
||||
protected function _dropTable($table) {
|
||||
return 'DROP TABLE IF EXISTS ' . $this->fullTableName($table) . ";";
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -570,8 +641,11 @@ class Mysql extends DboSource {
|
|||
}
|
||||
$name = $this->startQuote . $name . $this->endQuote;
|
||||
}
|
||||
// length attribute only used for MySQL datasource, for TEXT/BLOB index columns
|
||||
if (isset($value['type']) && strtolower($value['type']) === 'fulltext') {
|
||||
$out .= 'FULLTEXT ';
|
||||
}
|
||||
$out .= 'KEY ' . $name . ' (';
|
||||
|
||||
if (is_array($value['column'])) {
|
||||
if (isset($value['length'])) {
|
||||
$vals = array();
|
||||
|
|
@ -610,7 +684,7 @@ class Mysql extends DboSource {
|
|||
if (isset($indexes['drop'])) {
|
||||
foreach ($indexes['drop'] as $name => $value) {
|
||||
$out = 'DROP ';
|
||||
if ($name == 'PRIMARY') {
|
||||
if ($name === 'PRIMARY') {
|
||||
$out .= 'PRIMARY KEY';
|
||||
} else {
|
||||
$out .= 'KEY ' . $this->startQuote . $name . $this->endQuote;
|
||||
|
|
@ -635,7 +709,7 @@ class Mysql extends DboSource {
|
|||
* @return string Formatted length part of an index field
|
||||
*/
|
||||
protected function _buildIndexSubPart($lengths, $column) {
|
||||
if (is_null($lengths)) {
|
||||
if ($lengths === null) {
|
||||
return '';
|
||||
}
|
||||
if (!isset($lengths[$column])) {
|
||||
|
|
@ -645,7 +719,7 @@ class Mysql extends DboSource {
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns an detailed array of sources (tables) in the database.
|
||||
* Returns a detailed array of sources (tables) in the database.
|
||||
*
|
||||
* @param string $name Table name to get parameters
|
||||
* @return array Array of table names in the database
|
||||
|
|
@ -660,24 +734,23 @@ class Mysql extends DboSource {
|
|||
if (!$result) {
|
||||
$result->closeCursor();
|
||||
return array();
|
||||
} else {
|
||||
$tables = array();
|
||||
foreach ($result as $row) {
|
||||
$tables[$row['Name']] = (array)$row;
|
||||
unset($tables[$row['Name']]['queryString']);
|
||||
if (!empty($row['Collation'])) {
|
||||
$charset = $this->getCharsetName($row['Collation']);
|
||||
if ($charset) {
|
||||
$tables[$row['Name']]['charset'] = $charset;
|
||||
}
|
||||
}
|
||||
$tables = array();
|
||||
foreach ($result as $row) {
|
||||
$tables[$row['Name']] = (array)$row;
|
||||
unset($tables[$row['Name']]['queryString']);
|
||||
if (!empty($row['Collation'])) {
|
||||
$charset = $this->getCharsetName($row['Collation']);
|
||||
if ($charset) {
|
||||
$tables[$row['Name']]['charset'] = $charset;
|
||||
}
|
||||
}
|
||||
$result->closeCursor();
|
||||
if (is_string($name) && isset($tables[$name])) {
|
||||
return $tables[$name];
|
||||
}
|
||||
return $tables;
|
||||
}
|
||||
$result->closeCursor();
|
||||
if (is_string($name) && isset($tables[$name])) {
|
||||
return $tables[$name];
|
||||
}
|
||||
return $tables;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -704,9 +777,12 @@ class Mysql extends DboSource {
|
|||
if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
|
||||
return $col;
|
||||
}
|
||||
if (($col === 'tinyint' && $limit == 1) || $col === 'boolean') {
|
||||
if (($col === 'tinyint' && $limit === 1) || $col === 'boolean') {
|
||||
return 'boolean';
|
||||
}
|
||||
if (strpos($col, 'bigint') !== false || $col === 'bigint') {
|
||||
return 'biginteger';
|
||||
}
|
||||
if (strpos($col, 'int') !== false) {
|
||||
return 'integer';
|
||||
}
|
||||
|
|
@ -719,15 +795,32 @@ class Mysql extends DboSource {
|
|||
if (strpos($col, 'blob') !== false || $col === 'binary') {
|
||||
return 'binary';
|
||||
}
|
||||
if (strpos($col, 'float') !== false || strpos($col, 'double') !== false || strpos($col, 'decimal') !== false) {
|
||||
if (strpos($col, 'float') !== false || strpos($col, 'double') !== false) {
|
||||
return 'float';
|
||||
}
|
||||
if (strpos($col, 'decimal') !== false || strpos($col, 'numeric') !== false) {
|
||||
return 'decimal';
|
||||
}
|
||||
if (strpos($col, 'enum') !== false) {
|
||||
return "enum($vals)";
|
||||
}
|
||||
if (strpos($col, 'set') !== false) {
|
||||
return "set($vals)";
|
||||
}
|
||||
return 'text';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function value($data, $column = null, $null = true) {
|
||||
$value = parent::value($data, $column, $null);
|
||||
if (is_numeric($value) && substr($column, 0, 3) === 'set') {
|
||||
return $this->_connection->quote($value);
|
||||
}
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the schema name
|
||||
*
|
||||
|
|
@ -740,10 +833,73 @@ class Mysql extends DboSource {
|
|||
/**
|
||||
* Check if the server support nested transactions
|
||||
*
|
||||
* @return boolean
|
||||
* @return bool
|
||||
*/
|
||||
public function nestedTransactionSupported() {
|
||||
return $this->useNestedTransactions && version_compare($this->getVersion(), '4.1', '>=');
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if column type is unsigned
|
||||
*
|
||||
* @param string $real Real database-layer column type (i.e. "varchar(255)")
|
||||
* @return bool True if column is unsigned, false otherwise
|
||||
*/
|
||||
protected function _unsigned($real) {
|
||||
return strpos(strtolower($real), 'unsigned') !== false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Inserts multiple values into a table. Uses a single query in order to insert
|
||||
* multiple rows.
|
||||
*
|
||||
* @param string $table The table being inserted into.
|
||||
* @param array $fields The array of field/column names being inserted.
|
||||
* @param array $values The array of values to insert. The values should
|
||||
* be an array of rows. Each row should have values keyed by the column name.
|
||||
* Each row must have the values in the same order as $fields.
|
||||
* @return bool
|
||||
*/
|
||||
public function insertMulti($table, $fields, $values) {
|
||||
$table = $this->fullTableName($table);
|
||||
$holder = implode(', ', array_fill(0, count($fields), '?'));
|
||||
$fields = implode(', ', array_map(array($this, 'name'), $fields));
|
||||
$pdoMap = array(
|
||||
'integer' => PDO::PARAM_INT,
|
||||
'float' => PDO::PARAM_STR,
|
||||
'boolean' => PDO::PARAM_BOOL,
|
||||
'string' => PDO::PARAM_STR,
|
||||
'text' => PDO::PARAM_STR
|
||||
);
|
||||
$columnMap = array();
|
||||
$rowHolder = "({$holder})";
|
||||
$sql = "INSERT INTO {$table} ({$fields}) VALUES ";
|
||||
$countRows = count($values);
|
||||
for ($i = 0; $i < $countRows; $i++) {
|
||||
if ($i !== 0) {
|
||||
$sql .= ',';
|
||||
}
|
||||
$sql .= " $rowHolder";
|
||||
}
|
||||
$statement = $this->_connection->prepare($sql);
|
||||
foreach ($values[key($values)] as $key => $val) {
|
||||
$type = $this->introspectType($val);
|
||||
$columnMap[$key] = $pdoMap[$type];
|
||||
}
|
||||
$valuesList = array();
|
||||
$i = 1;
|
||||
foreach ($values as $value) {
|
||||
foreach ($value as $col => $val) {
|
||||
$valuesList[] = $val;
|
||||
$statement->bindValue($i, $val, $columnMap[$col]);
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
$result = $statement->execute();
|
||||
$statement->closeCursor();
|
||||
if ($this->fullDebug) {
|
||||
$this->logQuery($sql, $valuesList);
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue