php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-01 11:39:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-type-boolean-mysql

Browse Source
This commit is contained in:
Wilmer Arambula
2023-10-25 13:54:28 -03:00
parent 18ed620e78 9d3c71d6a7
commit 045996ed4b
5 changed files with 296 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
framework/db/mssql/Schema.php
View File

@ -375,6 +375,7 @@ SQL;
*/
protected function loadColumnSchema($info)
{
$isVersion2017orLater = version_compare($this->db->getSchema()->getServerVersion(), '14', '>=');
$column = $this->createColumnSchema();
$column->name = $info['column_name'];
@ -393,20 +394,21 @@ SQL;
if (isset($this->typeMap[$type])) {
$column->type = $this->typeMap[$type];
}
if ($isVersion2017orLater && $type === 'bit') {
$column->type = 'boolean';
}
if (!empty($matches[2])) {
$values = explode(',', $matches[2]);
$column->size = $column->precision = (int) $values[0];
if (isset($values[1])) {
$column->scale = (int) $values[1];
}
if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
$column->type = 'boolean';
} elseif ($type === 'bit') {
if ($column->size > 32) {
$column->type = 'bigint';
} elseif ($column->size === 32) {
$column->type = 'integer';
}
if ($isVersion2017orLater === false) {
$column->type = $this->booleanTypeLegacy($column->size, $type);
}
}
}
@ -813,4 +815,27 @@ SQL;
{
return Yii::createObject(ColumnSchemaBuilder::className(), [$type, $length, $this->db]);
}
/**
* Assigns a type boolean for the column type bit, for legacy versions of MSSQL.
*
* @param int $size column size.
* @param string $type column type.
*
* @return string column type.
*/
private function booleanTypeLegacy($size, $type)
{
if ($size === 1 && ($type === 'tinyint' || $type === 'bit')) {
return 'boolean';
} elseif ($type === 'bit') {
if ($size > 32) {
return 'bigint';
} elseif ($size === 32) {
return 'integer';
}
}
return $type;
}
}