Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
08e30ab
Test
SOHELAHMED7 Dec 21, 2022
e367a47
Merge branch '100-timestamp-migrations-do-not-work-in-mariadb' of git…
SOHELAHMED7 Dec 21, 2022
ec097d7
Test 2
SOHELAHMED7 Dec 21, 2022
03ca98b
test 3
SOHELAHMED7 Dec 21, 2022
6c90780
Merge branch 'master' of https://github.com/SOHELAHMED7/yii2-openapi …
SOHELAHMED7 Dec 21, 2022
984c7b3
Test
SOHELAHMED7 Dec 21, 2022
96257f6
Cleanup
SOHELAHMED7 Dec 21, 2022
d3ecd74
test
SOHELAHMED7 Dec 21, 2022
c809394
Fix issue in setting default expression
SOHELAHMED7 Dec 21, 2022
3d4d71c
Fix issue: decimal considered as string instead of double/float
SOHELAHMED7 Dec 21, 2022
a9c6ec2
Fix enum issue for MySQL, MariaDB and partially for PgSQL #111
SOHELAHMED7 Dec 22, 2022
89f98c2
WIP
SOHELAHMED7 Dec 23, 2022
b047f7d
undo WIP
SOHELAHMED7 Dec 23, 2022
6cea7f2
Fix issue: CREATE/DROP enum in PGSQL up/down migration not in correct…
SOHELAHMED7 Dec 23, 2022
6a9a680
Fix style
SOHELAHMED7 Dec 23, 2022
c60403f
Fix quote issue in migration down code for MySQL and Maria + add more…
SOHELAHMED7 Dec 23, 2022
fcc53a2
Fix multiple issue + add more tests for eunm in Pgsql + other DB
SOHELAHMED7 Dec 23, 2022
130c69a
Fix bug in column change detection in Pgsql
SOHELAHMED7 Dec 24, 2022
1b0bc2e
Fix failing tests
SOHELAHMED7 Dec 24, 2022
a037827
Fix enum related issues + add more tests for it for all 3 DBs
SOHELAHMED7 Dec 24, 2022
dae8e4c
Implement Enum change value migration - WIP
SOHELAHMED7 Dec 24, 2022
e67e8e1
WIP
SOHELAHMED7 Dec 24, 2022
ded2d2b
Complete enum tests + add stub for enum values change test
SOHELAHMED7 Dec 27, 2022
af614eb
Remove unwanted files
SOHELAHMED7 Dec 27, 2022
39d2ff0
Add docs in README
SOHELAHMED7 Dec 27, 2022
5badea4
Restore tests that were deleted in https://github.com/cebe/yii2-opena…
SOHELAHMED7 Dec 27, 2022
72c2a79
Add enh.
SOHELAHMED7 Dec 27, 2022
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
Prev Previous commit
Next Next commit
Fix bug in column change detection in Pgsql
  • Loading branch information
SOHELAHMED7 committed Dec 24, 2022
commit 130c69a0608cf1a085bf5c60bf1d8107d161e280
4 changes: 2 additions & 2 deletions src/lib/migrations/MysqlMigrationBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function modifyCurrent(ColumnSchema $current): void
$current->defaultValue = (int)$current->defaultValue;
}

// TODO this is not concretely correct
// TODO this is not concretely correct, reason is in BaseMigrationBuilder
if (!empty($current->enumValues)) {
$current->type = 'enum';
$current->dbType = 'enum';
Expand All @@ -139,7 +139,7 @@ public function modifyDesired(ColumnSchema $desired): void
$desired->scale = $decimalAttributes['scale'];
}

// TODO this is not concretely correct
// TODO this is not concretely correct, reason is in BaseMigrationBuilder
if (!empty($desired->enumValues)) {
$desired->type = 'enum';
$desired->dbType = 'enum';
Expand Down
9 changes: 6 additions & 3 deletions src/lib/migrations/PostgresMigrationBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ protected function buildColumnChanges(ColumnSchema $current, ColumnSchema $desir
return;
}

if (!empty(array_intersect(['type', 'size'/*, 'dbType'*/], $changed))) {
if (!empty(array_intersect(['type', 'size'
, 'dbType', 'phpType'
, 'precision', 'scale', 'unsigned'
], $changed))) {
$addUsing = $this->isNeedUsingExpression($desired->type, $current->type);
$this->migration->addUpCode($this->recordBuilder->alterColumnType($tableName, $desired));
$this->migration->addDownCode($this->recordBuilder->alterColumnTypeFromDb($tableName, $current, $addUsing));
Expand Down Expand Up @@ -207,7 +210,7 @@ public function modifyCurrent(ColumnSchema $current): void
if ($current->phpType === 'integer' && $current->defaultValue !== null) {
$current->defaultValue = (int)$current->defaultValue;
}
// TODO this is not concretely correct
// TODO this is not concretely correct, reason is in BaseMigrationBuilder
if (!empty($current->enumValues)) {
$current->type = 'enum';
$current->dbType = 'enum';
Expand All @@ -224,7 +227,7 @@ public function modifyDesired(ColumnSchema $desired): void
$desired->precision = $decimalAttributes['precision'];
$desired->scale = $decimalAttributes['scale'];
}
// TODO this is not concretely correct
// TODO this is not concretely correct, reason is in BaseMigrationBuilder
if (!empty($desired->enumValues)) {
$desired->type = 'enum';
$desired->dbType = 'enum';
Expand Down
8 changes: 4 additions & 4 deletions tests/specs/postgres_custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ components:
default: 0
json1:
type: array
x-db-type: json
x-db-type: jsonb
default: []
json2:
type: array
x-db-type: json
x-db-type: jsonb
default: '{}'
json3:
type: array
x-db-type: json
x-db-type: jsonb
default:
- foo: foobar
- xxx: yyy
json4:
type: array
x-db-type: json
x-db-type: jsonb
default: '{"foo": "bar", "bar": "baz"}'
# status:
# type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public function safeUp()
$this->db->createCommand('ALTER TABLE {{%editcolumns}} ADD COLUMN json_col_def_n json NOT NULL DEFAULT \'[]\'')->execute();
$this->db->createCommand('ALTER TABLE {{%editcolumns}} ADD COLUMN json_col_def_n_2 json NOT NULL DEFAULT \'[]\'')->execute();
$this->db->createCommand('ALTER TABLE {{%editcolumns}} ADD COLUMN text_col_array text[] NULL DEFAULT NULL')->execute();
$this->db->createCommand('ALTER TABLE {{%editcolumns}} ALTER COLUMN dec_col SET DATA TYPE decimal(12,2)')->execute();
$this->alterColumn('{{%editcolumns}}', 'dec_col', "SET DEFAULT 3.14");
$this->db->createCommand('ALTER TABLE {{%editcolumns}} ALTER COLUMN json_col SET DATA TYPE text')->execute();
$this->alterColumn('{{%editcolumns}}', 'json_col', "SET NOT NULL");
Expand All @@ -32,6 +33,7 @@ public function safeDown()
$this->alterColumn('{{%editcolumns}}', 'numeric_col', 'int4 NULL USING "numeric_col"::int4');
$this->alterColumn('{{%editcolumns}}', 'name', $this->string(255)->notNull());
$this->alterColumn('{{%editcolumns}}', 'json_col', 'jsonb NULL USING "json_col"::jsonb');
$this->alterColumn('{{%editcolumns}}', 'dec_col', $this->decimal()->null());
$this->dropColumn('{{%editcolumns}}', 'text_col_array');
$this->dropColumn('{{%editcolumns}}', 'json_col_def_n_2');
$this->dropColumn('{{%editcolumns}}', 'json_col_def_n');
Expand Down
2 changes: 1 addition & 1 deletion tests/specs/x_db_type/fresh/pgsql/x_db_type_pgsql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ components:
default: fox jumps over dog
json_col_2:
type: string
x-db-type: json
x-db-type: jsonb
nullable: false
default: []
numeric_col:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/XDbTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ private function createTableForEditColumns()
'string_col' => 'string not null',
'dec_col' => 'decimal(12, 4)',
'str_col_def' => 'string default \'hi there\'',
'json_col' => 'json',
'json_col' => 'json', // json is jsonb in Pgsql via Yii Pgsql Schema
'json_col_2' => 'json',
'numeric_col' => 'integer',
])->execute();
Expand Down