From 919606e79650f33f941f7fcbfe3dd756743eb947 Mon Sep 17 00:00:00 2001 From: Shaswata Dutta Date: Mon, 17 Aug 2020 23:44:48 +0530 Subject: [PATCH 1/6] Fixed migration issue with db table prefix --- ...19_05_13_111553_update_status_transfers_table.php | 12 ++++++------ ...25_103755_add_exchange_status_transfers_table.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php b/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php index aa9586cc4..d9cd6072b 100644 --- a/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php +++ b/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php @@ -32,7 +32,7 @@ public function up(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -41,8 +41,8 @@ public function up(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } @@ -77,7 +77,7 @@ public function down(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_PAID; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -86,8 +86,8 @@ public function down(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } diff --git a/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php b/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php index e1fb440db..85649fdab 100644 --- a/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php +++ b/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php @@ -31,7 +31,7 @@ public function up(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -40,8 +40,8 @@ public function up(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } } @@ -59,7 +59,7 @@ public function down(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -68,8 +68,8 @@ public function down(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } } From 12ec544c9d9533a8e0ed8561b7073052ebe93fb9 Mon Sep 17 00:00:00 2001 From: Reedknight Date: Mon, 17 Aug 2020 23:44:48 +0530 Subject: [PATCH 2/6] Fixed migration issue with db table prefix --- ...19_05_13_111553_update_status_transfers_table.php | 12 ++++++------ ...25_103755_add_exchange_status_transfers_table.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php b/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php index aa9586cc4..d9cd6072b 100644 --- a/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php +++ b/database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php @@ -32,7 +32,7 @@ public function up(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -41,8 +41,8 @@ public function up(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } @@ -77,7 +77,7 @@ public function down(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_PAID; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -86,8 +86,8 @@ public function down(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } diff --git a/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php b/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php index e1fb440db..85649fdab 100644 --- a/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php +++ b/database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php @@ -31,7 +31,7 @@ public function up(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -40,8 +40,8 @@ public function up(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } } @@ -59,7 +59,7 @@ public function down(): void ]; if (DB::connection() instanceof MySqlConnection) { - $table = $this->table(); + $table = DB::getTablePrefix() . $this->table(); $enumString = implode('\', \'', $enums); $default = Transfer::STATUS_TRANSFER; DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'"); @@ -68,8 +68,8 @@ public function down(): void } if (DB::connection() instanceof PostgresConnection) { - $this->alterEnum($this->table(), 'status', $enums); - $this->alterEnum($this->table(), 'status_last', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status', $enums); + $this->alterEnum(DB::getTablePrefix() . $this->table(), 'status_last', $enums); return; } } From b36e7c812d452c605419bdd615eab69ab87d102d Mon Sep 17 00:00:00 2001 From: Babichev Maxim Date: Mon, 17 Aug 2020 23:33:09 +0300 Subject: [PATCH 3/6] add prefix --- tests/TestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 8c9b9d151..be1671e9a 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -101,7 +101,7 @@ protected function getEnvironmentSetUp($app): void 'sqlite' => [ 'driver' => 'sqlite', 'database' => ':memory:', - 'prefix' => '', + 'prefix' => 'tests', ], 'pgsql' => [ 'driver' => 'pgsql', @@ -111,7 +111,7 @@ protected function getEnvironmentSetUp($app): void 'username' => 'postgres', 'password' => 'postgres', 'charset' => 'utf8', - 'prefix' => '', + 'prefix' => 'tests', 'schema' => 'public', 'sslmode' => 'prefer', ], From 49e1422f2987a692facf282f1c973e8ce99e5ee6 Mon Sep 17 00:00:00 2001 From: Babichev Maxim Date: Mon, 17 Aug 2020 23:36:26 +0300 Subject: [PATCH 4/6] update changelog.md --- changelog.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 8bb5e63d7..d5158e540 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.3.1] - 2020-08-10 +### Fixed +- Fixed migration issue with db table prefix #195 @reedknight @cispl-shaswatad + ## [5.3.0] - 2020-08-10 ### Added - Add `resetConfirm`, `safeResetConfirm` methods (unconfirmed). @@ -513,7 +517,8 @@ The operation is now executed in the transaction and updates the new `refund` fi - Exceptions: AmountInvalid, BalanceIsEmpty. - Models: Transfer, Transaction. -[Unreleased]: https://github.com/bavix/laravel-wallet/compare/5.3.0...develop +[Unreleased]: https://github.com/bavix/laravel-wallet/compare/5.3.1...develop +[5.3.1]: https://github.com/bavix/laravel-wallet/compare/5.3.0...5.3.1 [5.3.0]: https://github.com/bavix/laravel-wallet/compare/5.2.1...5.3.0 [5.2.1]: https://github.com/bavix/laravel-wallet/compare/5.2.0...5.2.1 [5.2.0]: https://github.com/bavix/laravel-wallet/compare/5.1.0...5.2.0 From e8fa923a30255f6a1d5cd8bf44e95f64dda0b29c Mon Sep 17 00:00:00 2001 From: Babichev Maxim Date: Mon, 17 Aug 2020 23:37:04 +0300 Subject: [PATCH 5/6] fix date --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index d5158e540..c54d6cff0 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [5.3.1] - 2020-08-10 +## [5.3.1] - 2020-08-18 ### Fixed - Fixed migration issue with db table prefix #195 @reedknight @cispl-shaswatad From 328a0ae31cdfb99120cb3458c41858481f5e7477 Mon Sep 17 00:00:00 2001 From: Babichev Maxim Date: Mon, 17 Aug 2020 23:45:58 +0300 Subject: [PATCH 6/6] infection only php 7.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7db0943e4..58d230e45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_script: script: - ./vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml - - ./vendor/bin/infection --coverage=build --min-msi=60 -j$(nproc) + - if [ $(phpenv version-name) = "7.4" ]; then ./vendor/bin/infection --coverage=build --min-msi=60 -j$(nproc); fi after_success: - if [ $(phpenv version-name) = "7.4" ]; then ./cc-test-reporter after-build --coverage-input-type clover --exit-code $TRAVIS_TEST_RESULT; fi