Merge pull request #197 from bavix/develop

Develop
bavix · Aug 18, 2020 · 1c26faf · 1c26faf
2 parents 09b5985 + 7c9d575
commit 1c26faf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git 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

diff --git 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-18
+### 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

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
@@ -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
@@ -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;
         }
     }

diff --git 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',
             ],