Merged in fix-conflict-migration-onepercent-to-tebus-table (pull request #57)

fix conflict migration onepercent to tebus table
This commit is contained in:
Amir Hassan Hamzan
2023-12-28 05:22:41 +00:00
@@ -21,28 +21,16 @@ class AddOnepercentToTebusTable extends Migration
public function getActiveDB() public function getActiveDB()
{ {
$config_db = array_keys(config("database.connections")); $config_db = array_keys(config("database.connections"));
<<<<<<< Updated upstream
$db_connection = array_filter($config_db, function ($connection) { $db_connection = array_filter($config_db, function ($connection) {
try { try {
if ($connection == 'mysql7') {
=======
$db_connection = array_filter($config_db,function($connection){
try{
if($connection == 'mysql7' || $connection == 'lelong') if($connection == 'mysql7' || $connection == 'lelong')
>>>>>>> Stashed changes
return false; return false;
}
$db = DB::connection($connection)->getPdo(); $db = DB::connection($connection)->getPdo();
return true; return true;
<<<<<<< Updated upstream
} catch (\Exception $e) { } catch (\Exception $e) {
=======
} catch(\Exception $e){
Log::info($connection); Log::info($connection);
>>>>>>> Stashed changes
return false; return false;
} }
}); });