Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
77 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
7dee6b9
Merge pull request #1 from SOHELAHMED7/100-timestamp-migrations-do-no…
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
a9e0312
Merge pull request #2 from SOHELAHMED7/timestamp-enum-x-db-type-bug-fix
SOHELAHMED7 Dec 28, 2022
c9322ad
test
SOHELAHMED7 Dec 28, 2022
a8d3b61
Undo test
SOHELAHMED7 Dec 28, 2022
c0563e7
Fix issue: defaultValue change detection for expression was not worki…
SOHELAHMED7 Dec 28, 2022
921f6ed
Merge pull request #3 from SOHELAHMED7/json-issue-fix
SOHELAHMED7 Dec 29, 2022
20e960a
test to trigger CI
SOHELAHMED7 Dec 29, 2022
4066e93
test to trigger CI 2
SOHELAHMED7 Dec 29, 2022
ca72322
test to trigger CI 3
SOHELAHMED7 Dec 29, 2022
672ae45
test to trigger CI 4
SOHELAHMED7 Dec 29, 2022
7da7317
Fix style
SOHELAHMED7 Dec 29, 2022
53d4de4
test to trigger CI 5
SOHELAHMED7 Dec 29, 2022
0041f7b
Fix style
SOHELAHMED7 Dec 29, 2022
a2d0c80
Fix https://github.com/cebe/yii2-openapi/issues/104
SOHELAHMED7 Dec 30, 2022
1f1e71f
remove unwanted files
SOHELAHMED7 Dec 30, 2022
86ae33d
Merge pull request #4 from SOHELAHMED7/104-remove-id-from-rules-metho…
SOHELAHMED7 Dec 30, 2022
8c074a9
Fix https://github.com/cebe/yii2-openapi/issues/115
SOHELAHMED7 Dec 30, 2022
512a11e
Merge pull request #5 from SOHELAHMED7/115-default-in-openapi-schema-…
SOHELAHMED7 Dec 30, 2022
91273e8
test
SOHELAHMED7 Dec 30, 2022
0ac648d
Add tests for this issue
SOHELAHMED7 Dec 30, 2022
d7e57a0
remove unwanted space from README
SOHELAHMED7 Dec 30, 2022
0eae0f4
Merge pull request #6 from SOHELAHMED7/114-errors-in-migrations-in-ca…
SOHELAHMED7 Dec 30, 2022
4aad200
Merge branch 'cebe:master' into master
SOHELAHMED7 Dec 30, 2022
220d1ee
Test
SOHELAHMED7 Dec 30, 2022
c73c16d
Fix https://github.com/cebe/yii2-openapi/issues/125
SOHELAHMED7 Dec 30, 2022
a6fc5b1
Run actual migrations
SOHELAHMED7 Dec 31, 2022
09a5fb8
Add a test for float issue in PgSQL
SOHELAHMED7 Dec 31, 2022
67ad00c
test
SOHELAHMED7 Dec 31, 2022
2e382e4
Undo test
SOHELAHMED7 Dec 31, 2022
a8d8788
WIP
SOHELAHMED7 Dec 31, 2022
433e7f0
Fix https://github.com/cebe/yii2-openapi/issues/126
SOHELAHMED7 Jan 2, 2023
ce56996
Merge pull request #8 from SOHELAHMED7/126-dont-use-second-db-pgtestd…
SOHELAHMED7 Jan 2, 2023
60dd357
Merge branches 'master' and '107-migrations-are-generated-with-syntax…
SOHELAHMED7 Jan 2, 2023
d0b83eb
Remove unwanted line
SOHELAHMED7 Jan 2, 2023
9e341e9
Initial commit of this branch
SOHELAHMED7 Jan 2, 2023
4da1db2
Fix https://github.com/cebe/yii2-openapi/issues/127
SOHELAHMED7 Jan 2, 2023
2f58a9e
Fix quote issue in enum in PgSQL
SOHELAHMED7 Jan 2, 2023
e8f1df1
Fix quote issue in enum in PgSQL 2
SOHELAHMED7 Jan 2, 2023
eaf2464
Merge pull request #9 from SOHELAHMED7/127-quote-issue-to-preserve-th…
SOHELAHMED7 Jan 3, 2023
a37e2ca
Merge branches 'master' and '107-migrations-are-generated-with-syntax…
SOHELAHMED7 Jan 3, 2023
a6c20ef
Fix failing tests
SOHELAHMED7 Jan 3, 2023
3fff89a
Fix https://github.com/cebe/yii2-openapi/issues/107
SOHELAHMED7 Jan 3, 2023
1cdb53b
Merge pull request #7 from SOHELAHMED7/107-migrations-are-generated-w…
SOHELAHMED7 Jan 3, 2023
8aa5697
Initial commit of this branch to create PR
SOHELAHMED7 Jan 3, 2023
dcbde27
Add tests
SOHELAHMED7 Jan 3, 2023
123e67a
Implement quote in enum type names
SOHELAHMED7 Jan 3, 2023
d4527f5
Implement enum with table name
SOHELAHMED7 Jan 3, 2023
d4f6f2d
Adjust tests for enum with table name
SOHELAHMED7 Jan 4, 2023
e2fc2e9
Merge pull request #10 from SOHELAHMED7/128-change-enum-name-generati…
SOHELAHMED7 Jan 4, 2023
8250c09
Fix errors in https://github.com/SOHELAHMED7/yii2-openapi/pull/10
SOHELAHMED7 Jan 4, 2023
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
WIP
  • Loading branch information
SOHELAHMED7 committed Dec 23, 2022
commit 89f98c202e2d2baaad0c20529dbda385e62c02fc
43 changes: 40 additions & 3 deletions src/lib/items/MigrationModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
namespace cebe\yii2openapi\lib\items;

use yii\base\BaseObject;
use yii\helpers\Inflector;
use yii\helpers\{Inflector, VarDumper};
use cebe\yii2openapi\generator\ApiGenerator;
use function array_push;
use function array_unshift;
use function implode;
Expand Down Expand Up @@ -72,14 +73,50 @@ public function __construct(DbModel $model, bool $isFresh = true, ManyToManyRela
}
}

/**
* @param ?array $codes
* @param string $direction ENUM allowed value can be one of "UP", "DOWN"
*/
public static function moveEnumStatementForPgsql(?array $codes, string $direction)
{
// for up migration move enum statemenet to botton
// for down migration move enum statemenet to top

if (!ApiGenerator::isPostgres() || empty($codes)) {
return $codes;
}

// $enumKey = null;
// foreach ($codes as $key => $code) {
// if (strpos($code, ' TYPE enum_') !== false) {
// $enumKey = $key;
// break;
// }
// }

// if ($enumKey !== null) {
// if ($direction === 'UP') {
// array_push($codes, $codes[$enumKey]);
// unset($codes[$enumKey]);
// } elseif ($direction === 'DOWN') {
// $code = $codes[$enumKey];
// unset($codes[$enumKey]);
// array_unshift($codes, $code);
// } else {
// throw new \Exception('Unknown direction found.');
// }
// }
return $codes;
}

public function getUpCodeString():string
{
return !empty($this->upCodes) ? implode(PHP_EOL, $this->upCodes) : '';
return !empty($this->upCodes) ? implode(PHP_EOL, static::moveEnumStatementForPgsql($this->upCodes, 'UP')) : '';
}

public function getDownCodeString():string
{
return !empty($this->downCodes) ? implode(PHP_EOL, $this->downCodes) : '';
return !empty($this->downCodes) ? implode(PHP_EOL, static::moveEnumStatementForPgsql($this->downCodes, 'DOWN')) : '';
}

public function notEmpty():bool
Expand Down