Skip to content

Commit aa9adc8

Browse files
authored
Merge pull request #20061 from terabytesoftw/revert-20045
Revert 20045.
2 parents 11c80bf + 0263c19 commit aa9adc8

File tree

4 files changed

+1
-256
lines changed

4 files changed

+1
-256
lines changed

framework/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Yii Framework 2 Change Log
33

44
2.0.50 under development
55
------------------------
6-
- Bug #20045: Fix type `boolean` in `MySQL` (terabytesoftw)
76
- Bug #20040: Fix type `boolean` in `MSSQL` (terabytesoftw)
87
- Bug #20005: Fix `yii\console\controllers\ServeController` to specify the router script (terabytesoftw)
98
- Bug #19060: Fix `yii\widgets\Menu` bug when using Closure for active item and adding additional tests in `tests\framework\widgets\MenuTest` (atrandafir)

framework/db/mysql/Schema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected function loadColumnSchema($info)
279279
if (isset($values[1])) {
280280
$column->scale = (int) $values[1];
281281
}
282-
if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
282+
if ($column->size === 1 && $type === 'bit') {
283283
$column->type = 'boolean';
284284
} elseif ($type === 'bit') {
285285
if ($column->size > 32) {

tests/framework/db/mysql/SchemaTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,6 @@ public function getExpectedColumns()
228228
]
229229
);
230230

231-
$columns['bool_col']['type'] = 'boolean';
232-
$columns['bool_col']['phpType'] = 'boolean';
233-
$columns['bool_col2']['type'] = 'boolean';
234-
$columns['bool_col2']['phpType'] = 'boolean';
235-
236231
if (version_compare($version, '5.7', '<')) {
237232
$columns['int_col3']['phpType'] = 'string';
238233
$columns['json_col']['type'] = 'text';

tests/framework/db/mysql/type/BooleanTest.php

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)