Fix failing tests

SOHELAHMED7 · SOHELAHMED7 · commit 754d1fe2c9e4 · 2025-02-20T15:53:08.000+05:30
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Alldbdatatype.php
@@ -66,6 +66,16 @@ public function rules()
     {
         return [
             'trim' => [['string_col', 'varchar_col', 'text_col', 'varchar_4_col', 'char_4_col', 'char_5_col', 'char_6_col', 'char_7_col', 'char_8_col', 'date_col', 'time_col', 'datetime_col', 'timestamp_col', 'year_col', 'text_def'], 'trim'],
+            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
+            'mi_default' => [['mi'], 'default', 'value' => 7],
+            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
+            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
+            'blob_def_default' => [['blob_def'], 'default', 'value' => 'the blob'],
+            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
+            'json_def_default' => [['json_def'], 'default', 'value' => [
+                'a' => 'b',
+            ]],
+            'required' => [['char_6_col', 'char_7_col'], 'required'],
             'string_col_string' => [['string_col'], 'string', 'max' => 255],
             'varchar_col_string' => [['varchar_col'], 'string', 'max' => 132],
             'text_col_string' => [['text_col'], 'string'],
@@ -75,7 +85,6 @@ public function rules()
             'char_6_col_string' => [['char_6_col'], 'string'],
             'char_7_col_string' => [['char_7_col'], 'string', 'max' => 6],
             'char_8_col_string' => [['char_8_col'], 'string'],
-            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
             'decimal_col_double' => [['decimal_col'], 'double'],
             'bit_col_integer' => [['bit_col'], 'integer'],
             'bit_2_integer' => [['bit_2'], 'integer'],
@@ -86,7 +95,6 @@ public function rules()
             'si_col_integer' => [['si_col'], 'integer'],
             'si_col_2_integer' => [['si_col_2'], 'integer'],
             'mi_integer' => [['mi'], 'integer'],
-            'mi_default' => [['mi'], 'default', 'value' => 7],
             'bi_integer' => [['bi'], 'integer'],
             'int_col_integer' => [['int_col'], 'integer'],
             'int_col_2_integer' => [['int_col_2'], 'integer'],
@@ -103,16 +111,8 @@ public function rules()
             'datetime_col_datetime' => [['datetime_col'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
             'timestamp_col_string' => [['timestamp_col'], 'string'],
             'year_col_string' => [['year_col'], 'string'],
-            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
-            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
-            'blob_def_default' => [['blob_def'], 'default', 'value' => 'the blob'],
             'text_def_string' => [['text_def'], 'string'],
-            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
-            'json_def_default' => [['json_def'], 'default', 'value' => [
-                'a' => 'b',
-            ]],
             'safe' => [['varbinary_col', 'blob_col', 'json_col', 'json_col_def', 'json_col_def_2', 'blob_def', 'json_def'], 'safe'],
-            'required' => [['char_6_col', 'char_7_col'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Editcolumn.php
@@ -34,22 +34,22 @@ public function rules()
     {
         return [
             'trim' => [['name', 'tag', 'first_name', 'string_col', 'str_col_def', 'json_col'], 'trim'],
-            'name_string' => [['name'], 'string', 'max' => 254],
             'name_default' => [['name'], 'default', 'value' => 'Horse-2'],
+            'dec_col_default' => [['dec_col'], 'default', 'value' => 3.14],
+            'json_col_default' => [['json_col'], 'default', 'value' => 'fox jumps over dog'],
+            'json_col_2_default' => [['json_col_2'], 'default', 'value' => []],
+            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
+            'json_col_def_n_2_default' => [['json_col_def_n_2'], 'default', 'value' => []],
+            'required' => [['name', 'str_col_def', 'json_col', 'json_col_2'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 254],
             'tag_string' => [['tag'], 'string'],
             'first_name_string' => [['first_name'], 'string', 'max' => 255],
             'string_col_string' => [['string_col'], 'string'],
             'dec_col_double' => [['dec_col'], 'double'],
-            'dec_col_default' => [['dec_col'], 'default', 'value' => 3.14],
             'str_col_def_string' => [['str_col_def'], 'string', 'max' => 3],
             'json_col_string' => [['json_col'], 'string'],
-            'json_col_default' => [['json_col'], 'default', 'value' => 'fox jumps over dog'],
-            'json_col_2_default' => [['json_col_2'], 'default', 'value' => []],
             'numeric_col_double' => [['numeric_col'], 'double'],
-            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
-            'json_col_def_n_2_default' => [['json_col_def_n_2'], 'default', 'value' => []],
             'safe' => [['json_col_2', 'json_col_def_n', 'json_col_def_n_2'], 'safe'],
-            'required' => [['name', 'str_col_def', 'json_col', 'json_col_2'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Newcolumn.php
@@ -30,14 +30,14 @@ public function rules()
     {
         return [
             'trim' => [['name', 'last_name', 'varchar_col'], 'trim'],
+            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
+            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 255],
             'last_name_string' => [['last_name'], 'string'],
             'dec_col_double' => [['dec_col'], 'double'],
             'varchar_col_string' => [['varchar_col'], 'string', 'max' => 5],
             'numeric_col_double' => [['numeric_col'], 'double'],
-            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
             'safe' => [['json_col', 'json_col_def_n'], 'safe'],
-            'required' => [['name'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/maria/app/models/mariamodel/base/Pristine.php
@@ -34,10 +34,12 @@ public function rules()
     {
         return [
             'trim' => [['name', 'tag', 'new_col', 'col_9', 'col_10', 'col_11'], 'trim'],
+            'tag_default' => [['tag'], 'default', 'value' => '4 leg'],
+            'price_default' => [['price'], 'default', 'value' => 0],
+            'required' => [['custom_id_col', 'name'], 'required'],
             'custom_id_col_integer' => [['custom_id_col'], 'integer'],
             'name_string' => [['name'], 'string'],
             'tag_string' => [['tag'], 'string'],
-            'tag_default' => [['tag'], 'default', 'value' => '4 leg'],
             'new_col_string' => [['new_col'], 'string', 'max' => 17],
             'col_5_double' => [['col_5'], 'double'],
             'col_6_double' => [['col_6'], 'double'],
@@ -46,9 +48,7 @@ public function rules()
             'col_10_string' => [['col_10'], 'string', 'max' => 10],
             'col_11_string' => [['col_11'], 'string'],
             'price_double' => [['price'], 'double'],
-            'price_default' => [['price'], 'default', 'value' => 0],
             'safe' => [['col_8'], 'safe'],
-            'required' => [['custom_id_col', 'name'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Alldbdatatype.php
@@ -66,6 +66,16 @@ public function rules()
     {
         return [
             'trim' => [['string_col', 'varchar_col', 'text_col', 'varchar_4_col', 'char_4_col', 'char_5_col', 'char_6_col', 'char_7_col', 'char_8_col', 'date_col', 'time_col', 'datetime_col', 'timestamp_col', 'year_col', 'text_def'], 'trim'],
+            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
+            'mi_default' => [['mi'], 'default', 'value' => 7],
+            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
+            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
+            'blob_def_default' => [['blob_def'], 'default', 'value' => 'the blob'],
+            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
+            'json_def_default' => [['json_def'], 'default', 'value' => [
+                'a' => 'b',
+            ]],
+            'required' => [['char_6_col', 'char_7_col'], 'required'],
             'string_col_string' => [['string_col'], 'string', 'max' => 255],
             'varchar_col_string' => [['varchar_col'], 'string', 'max' => 132],
             'text_col_string' => [['text_col'], 'string'],
@@ -75,7 +85,6 @@ public function rules()
             'char_6_col_string' => [['char_6_col'], 'string'],
             'char_7_col_string' => [['char_7_col'], 'string', 'max' => 6],
             'char_8_col_string' => [['char_8_col'], 'string'],
-            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
             'decimal_col_double' => [['decimal_col'], 'double'],
             'bit_col_integer' => [['bit_col'], 'integer'],
             'bit_2_integer' => [['bit_2'], 'integer'],
@@ -86,7 +95,6 @@ public function rules()
             'si_col_integer' => [['si_col'], 'integer'],
             'si_col_2_integer' => [['si_col_2'], 'integer'],
             'mi_integer' => [['mi'], 'integer'],
-            'mi_default' => [['mi'], 'default', 'value' => 7],
             'bi_integer' => [['bi'], 'integer'],
             'int_col_integer' => [['int_col'], 'integer'],
             'int_col_2_integer' => [['int_col_2'], 'integer'],
@@ -103,16 +111,8 @@ public function rules()
             'datetime_col_datetime' => [['datetime_col'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
             'timestamp_col_string' => [['timestamp_col'], 'string'],
             'year_col_string' => [['year_col'], 'string'],
-            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
-            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
-            'blob_def_default' => [['blob_def'], 'default', 'value' => 'the blob'],
             'text_def_string' => [['text_def'], 'string'],
-            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
-            'json_def_default' => [['json_def'], 'default', 'value' => [
-                'a' => 'b',
-            ]],
             'safe' => [['varbinary_col', 'blob_col', 'json_col', 'json_col_def', 'json_col_def_2', 'blob_def', 'json_def'], 'safe'],
-            'required' => [['char_6_col', 'char_7_col'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Editcolumn.php
@@ -34,22 +34,22 @@ public function rules()
     {
         return [
             'trim' => [['name', 'tag', 'first_name', 'string_col', 'str_col_def', 'json_col'], 'trim'],
-            'name_string' => [['name'], 'string', 'max' => 254],
             'name_default' => [['name'], 'default', 'value' => 'Horse-2'],
+            'dec_col_default' => [['dec_col'], 'default', 'value' => 3.14],
+            'json_col_default' => [['json_col'], 'default', 'value' => 'fox jumps over dog'],
+            'json_col_2_default' => [['json_col_2'], 'default', 'value' => []],
+            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
+            'json_col_def_n_2_default' => [['json_col_def_n_2'], 'default', 'value' => []],
+            'required' => [['name', 'str_col_def', 'json_col', 'json_col_2'], 'required'],
+            'name_string' => [['name'], 'string', 'max' => 254],
             'tag_string' => [['tag'], 'string'],
             'first_name_string' => [['first_name'], 'string', 'max' => 255],
             'string_col_string' => [['string_col'], 'string'],
             'dec_col_double' => [['dec_col'], 'double'],
-            'dec_col_default' => [['dec_col'], 'default', 'value' => 3.14],
             'str_col_def_string' => [['str_col_def'], 'string', 'max' => 3],
             'json_col_string' => [['json_col'], 'string'],
-            'json_col_default' => [['json_col'], 'default', 'value' => 'fox jumps over dog'],
-            'json_col_2_default' => [['json_col_2'], 'default', 'value' => []],
             'numeric_col_double' => [['numeric_col'], 'double'],
-            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
-            'json_col_def_n_2_default' => [['json_col_def_n_2'], 'default', 'value' => []],
             'safe' => [['json_col_2', 'json_col_def_n', 'json_col_def_n_2'], 'safe'],
-            'required' => [['name', 'str_col_def', 'json_col', 'json_col_2'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Newcolumn.php
@@ -30,14 +30,14 @@ public function rules()
     {
         return [
             'trim' => [['name', 'last_name', 'varchar_col'], 'trim'],
+            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
+            'required' => [['name'], 'required'],
             'name_string' => [['name'], 'string', 'max' => 255],
             'last_name_string' => [['last_name'], 'string'],
             'dec_col_double' => [['dec_col'], 'double'],
             'varchar_col_string' => [['varchar_col'], 'string', 'max' => 5],
             'numeric_col_double' => [['numeric_col'], 'double'],
-            'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],
             'safe' => [['json_col', 'json_col_def_n'], 'safe'],
-            'required' => [['name'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/mysql/app/models/base/Pristine.php
@@ -34,10 +34,12 @@ public function rules()
     {
         return [
             'trim' => [['name', 'tag', 'new_col', 'col_9', 'col_10', 'col_11'], 'trim'],
+            'tag_default' => [['tag'], 'default', 'value' => '4 leg'],
+            'price_default' => [['price'], 'default', 'value' => 0],
+            'required' => [['custom_id_col', 'name'], 'required'],
             'custom_id_col_integer' => [['custom_id_col'], 'integer'],
             'name_string' => [['name'], 'string'],
             'tag_string' => [['tag'], 'string'],
-            'tag_default' => [['tag'], 'default', 'value' => '4 leg'],
             'new_col_string' => [['new_col'], 'string', 'max' => 17],
             'col_5_double' => [['col_5'], 'double'],
             'col_6_double' => [['col_6'], 'double'],
@@ -46,9 +48,7 @@ public function rules()
             'col_10_string' => [['col_10'], 'string', 'max' => 10],
             'col_11_string' => [['col_11'], 'string'],
             'price_double' => [['price'], 'double'],
-            'price_default' => [['price'], 'default', 'value' => 0],
             'safe' => [['col_8'], 'safe'],
-            'required' => [['custom_id_col', 'name'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Alldbdatatype.php
@@ -116,6 +116,18 @@ public function rules()
     {
         return [
             'trim' => [['string_col', 'varchar_col', 'text_col', 'varchar_4_col', 'varchar_5_col', 'char_4_col', 'char_5_col', 'char_6_col', 'char_7_col', 'char_8_col', 'date_col', 'time_col', 'time_col_2', 'time_col_3', 'time_col_4', 'timetz_col', 'timetz_col_2', 'timestamp_col', 'timestamp_col_2', 'timestamp_col_3', 'timestamp_col_4', 'timestamptz_col', 'timestamptz_col_2', 'date2', 'timestamp_col_z', 'box_col', 'character_col', 'character_n', 'character_varying', 'character_varying_n', 'text_def', 'cidr_col', 'circle_col', 'date_col_z', 'inet_col', 'interval_col', 'interval_col_2', 'interval_col_3', 'line_col', 'lseg_col', 'macaddr_col', 'money_col', 'path_col', 'point_col', 'polygon_col', 'tsquery_col', 'tsvector_col', 'txid_snapshot_col', 'uuid_col', 'xml_col'], 'trim'],
+            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
+            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
+            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
+            'bytea_def_default' => [['bytea_def'], 'default', 'value' => 'the bytea blob default'],
+            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
+            'json_def_default' => [['json_def'], 'default', 'value' => [
+                'a' => 'b',
+            ]],
+            'jsonb_def_default' => [['jsonb_def'], 'default', 'value' => [
+                'ba' => 'bb',
+            ]],
+            'required' => [['char_6_col', 'char_7_col', 'smallserial_col', 'serial2_col', 'bigserial_col', 'bigserial_col_2', 'serial_col', 'serial4_col'], 'required'],
             'string_col_string' => [['string_col'], 'string'],
             'varchar_col_string' => [['varchar_col'], 'string'],
             'text_col_string' => [['text_col'], 'string'],
@@ -126,7 +138,6 @@ public function rules()
             'char_6_col_string' => [['char_6_col'], 'string'],
             'char_7_col_string' => [['char_7_col'], 'string', 'max' => 6],
             'char_8_col_string' => [['char_8_col'], 'string'],
-            'char_8_col_default' => [['char_8_col'], 'default', 'value' => 'd'],
             'decimal_col_double' => [['decimal_col'], 'double'],
             'bit_col_integer' => [['bit_col'], 'integer'],
             'bit_2_integer' => [['bit_2'], 'integer'],
@@ -177,17 +188,7 @@ public function rules()
             'character_n_string' => [['character_n'], 'string', 'max' => 12],
             'character_varying_string' => [['character_varying'], 'string'],
             'character_varying_n_string' => [['character_varying_n'], 'string', 'max' => 12],
-            'json_col_def_default' => [['json_col_def'], 'default', 'value' => []],
-            'json_col_def_2_default' => [['json_col_def_2'], 'default', 'value' => []],
-            'bytea_def_default' => [['bytea_def'], 'default', 'value' => 'the bytea blob default'],
             'text_def_string' => [['text_def'], 'string'],
-            'text_def_default' => [['text_def'], 'default', 'value' => 'the text'],
-            'json_def_default' => [['json_def'], 'default', 'value' => [
-                'a' => 'b',
-            ]],
-            'jsonb_def_default' => [['jsonb_def'], 'default', 'value' => [
-                'ba' => 'bb',
-            ]],
             'cidr_col_string' => [['cidr_col'], 'string'],
             'circle_col_string' => [['circle_col'], 'string'],
             'date_col_z_date' => [['date_col_z'], 'date', 'format' => 'php:Y-m-d'],
@@ -212,7 +213,6 @@ public function rules()
             'uuid_col_string' => [['uuid_col'], 'string'],
             'xml_col_string' => [['xml_col'], 'string'],
             'safe' => [['text_col_array', 'bytea_col_2', 'json_col', 'jsonb_col', 'json_col_def', 'json_col_def_2', 'bytea_def', 'json_def', 'jsonb_def'], 'safe'],
-            'required' => [['char_6_col', 'char_7_col', 'smallserial_col', 'serial2_col', 'bigserial_col', 'bigserial_col_2', 'serial_col', 'serial4_col'], 'required'],
         ];
     }
 }
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Editcolumn.php
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Newcolumn.php
diff --git a/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php b/tests/specs/x_db_type/rules_and_more/pgsql/app/models/pgsqlmodel/base/Pristine.php

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,14 @@ public function rules()`
`30`	`30`	`{`
`31`	`31`	`return [`
`32`	`32`	`'trim' => [['name', 'last_name', 'varchar_col'], 'trim'],`
	`33`	`+ 'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],`
	`34`	`+ 'required' => [['name'], 'required'],`
`33`	`35`	`'name_string' => [['name'], 'string', 'max' => 255],`
`34`	`36`	`'last_name_string' => [['last_name'], 'string'],`
`35`	`37`	`'dec_col_double' => [['dec_col'], 'double'],`
`36`	`38`	`'varchar_col_string' => [['varchar_col'], 'string', 'max' => 5],`
`37`	`39`	`'numeric_col_double' => [['numeric_col'], 'double'],`
`38`		`- 'json_col_def_n_default' => [['json_col_def_n'], 'default', 'value' => []],`
`39`	`40`	`'safe' => [['json_col', 'json_col_def_n'], 'safe'],`
`40`		`- 'required' => [['name'], 'required'],`
`41`	`41`	`];`
`42`	`42`	`}`
`43`	`43`	`}`