Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #20195 Do not set parts of ColumnSchema->dbType values into Colum… #20197

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Fix #20195 Do not set parts of ColumnSchema->dbType values into Colum… #20197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe3681
Fix #20195 Do not set parts of ColumnSchema->dbType values into Colum…
axeltomasson Jun 11, 2024
30d7eb2
Update CHANGELOG.md
samdark Jun 12, 2024
741a3ea
Merge branch 'master' into 20195-fix-non-abstract-values-in-column-type
samdark Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.51 under development
------------------------

- Bug #20195: Do not set non abstract values into ColumnSchema->type on mssql version less then 2017 (axeltomasson)
- Bug #20191: Fix `ActiveRecord::getDirtyAttributes()` for JSON columns with multi-dimensional array values (brandonkelly)
- Bug #20175: Fix bad result for pagination when used with GridView (@lav45)

Expand Down
32 changes: 9 additions & 23 deletions framework/db/mssql/Schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,15 @@
}

if ($isVersion2017orLater === false) {
$column->type = $this->booleanTypeLegacy($column->size, $type);
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';

Check warning on line 417 in framework/db/mssql/Schema.php

View check run for this annotation

Codecov / codecov/patch

framework/db/mssql/Schema.php#L411-L417 

Added lines #L411 - L417 were not covered by tests
}
}
}
}
}
Expand Down Expand Up @@ -816,26 +824,4 @@
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;
}
}
Loading