Merge pull request #20061 from terabytesoftw/revert-20045

Revert 20045.
yiisoft · Nov 2, 2023 · aa9adc8 · aa9adc8
2 parents 11c80bf + 0263c19
commit aa9adc8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 256 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -3,7 +3,6 @@ Yii Framework 2 Change Log
 
 2.0.50 under development
 ------------------------
-- Bug #20045: Fix type `boolean` in `MySQL` (terabytesoftw)
 - Bug #20040: Fix type `boolean` in `MSSQL` (terabytesoftw)
 - Bug #20005: Fix `yii\console\controllers\ServeController` to specify the router script (terabytesoftw)
 - Bug #19060: Fix `yii\widgets\Menu` bug when using Closure for active item and adding additional tests in `tests\framework\widgets\MenuTest` (atrandafir)

diff --git a/framework/db/mysql/Schema.php b/framework/db/mysql/Schema.php
@@ -279,7 +279,7 @@ protected function loadColumnSchema($info)
                     if (isset($values[1])) {
                         $column->scale = (int) $values[1];
                     }
-                    if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
+                    if ($column->size === 1 && $type === 'bit') {
                         $column->type = 'boolean';
                     } elseif ($type === 'bit') {
                         if ($column->size > 32) {

diff --git a/tests/framework/db/mysql/SchemaTest.php b/tests/framework/db/mysql/SchemaTest.php
@@ -228,11 +228,6 @@ public function getExpectedColumns()
             ]
         );
 
-        $columns['bool_col']['type'] = 'boolean';
-        $columns['bool_col']['phpType'] = 'boolean';
-        $columns['bool_col2']['type'] = 'boolean';
-        $columns['bool_col2']['phpType'] = 'boolean';
-
         if (version_compare($version, '5.7', '<')) {
             $columns['int_col3']['phpType'] = 'string';
             $columns['json_col']['type'] = 'text';

diff --git a/tests/framework/db/mysql/type/BooleanTest.php b/tests/framework/db/mysql/type/BooleanTest.php