Merge branch 'master' into feat/laravel-email-confirmation

monicahq · Oct 28, 2018 · c79ae62 · c79ae62
2 parents b016dae + dc21d00
commit c79ae62
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 50 deletions.
diff --git a/app/Console/Commands/Update.php b/app/Console/Commands/Update.php
@@ -117,12 +117,12 @@ private function migrateCollationTest()
 
         $databasename = $connection->getDatabaseName();
 
-        $schemata = $connection->table('information_schema.schemata')
-                ->select('DEFAULT_CHARACTER_SET_NAME')
-                ->where('schema_name', '=', $databasename)
-                ->get();
+        $schemata = DB::select(
+            'select DEFAULT_CHARACTER_SET_NAME from information_schema.schemata where schema_name = ?',
+            [$databasename]
+        );
 
-        $schema = $schemata->first()->DEFAULT_CHARACTER_SET_NAME;
+        $schema = $schemata[0]->DEFAULT_CHARACTER_SET_NAME;
 
         return config('database.use_utf8mb4') && $schema == 'utf8'
             || ! config('database.use_utf8mb4') && $schema == 'utf8mb4';

diff --git a/config/database.php b/config/database.php
@@ -96,7 +96,7 @@
             'password' => env('DB_TEST_PASSWORD'),
             'charset' => env('DB_USE_UTF8MB4', true) ? 'utf8mb4' : 'utf8',
             'collation' => env('DB_USE_UTF8MB4', true) ? 'utf8mb4_unicode_ci' : 'utf8_unicode_ci',
-            'prefix' => '',
+            'prefix' => env('DB_TEST_PREFIX', ''),
             'strict' => false,
         ],
 

diff --git a/database/migrations/2017_06_07_173437_add_multiple_genders_choices.php b/database/migrations/2017_06_07_173437_add_multiple_genders_choices.php
@@ -13,16 +13,17 @@ class AddMultipleGendersChoices extends Migration
     public function up()
     {
         $driverName = DB::connection()->getDriverName();
+        $tablePrefix = DB::connection()->getTablePrefix();
         switch ($driverName) {
             case 'mysql':
-                DB::statement("ALTER TABLE contacts CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
-                DB::statement("ALTER TABLE significant_others CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
-                DB::statement("ALTER TABLE kids CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
+                DB::statement('ALTER TABLE '.$tablePrefix."contacts CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
+                DB::statement('ALTER TABLE '.$tablePrefix."significant_others CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
+                DB::statement('ALTER TABLE '.$tablePrefix."kids CHANGE COLUMN gender gender ENUM('male', 'female', 'none')");
                 break;
             case 'pgsql':
-                $this->alterEnum('contacts', 'gender', ['male', 'female', 'none']);
-                $this->alterEnum('significant_others', 'gender', ['male', 'female', 'none']);
-                $this->alterEnum('kids', 'gender', ['male', 'female', 'none']);
+                $this->alterEnum($tablePrefix.'contacts', 'gender', ['male', 'female', 'none']);
+                $this->alterEnum($tablePrefix.'significant_others', 'gender', ['male', 'female', 'none']);
+                $this->alterEnum($tablePrefix.'kids', 'gender', ['male', 'female', 'none']);
                 break;
             default:
                 throw new \Exception("Driver {$driverName} not supported.");

diff --git a/database/migrations/2018_10_07_120133_fix_json_column.php b/database/migrations/2018_10_07_120133_fix_json_column.php
@@ -20,21 +20,15 @@ public function up()
 
         $databasename = $connection->getDatabaseName();
 
-        $columns = $connection->table('information_schema.columns')
-                            ->select('table_name', 'column_name')
-                            ->where([
-                                ['table_schema', '=', $databasename],
-                                ['data_type', '=', 'json'],
-                            ])
-                            ->whereIn('table_name', [
-                                'default_life_event_types',
-                                'life_event_types',
-                                'life_events',
-                            ])
-                            ->get();
+        $columns = DB::select(
+            'select table_name, column_name from information_schema.columns where table_schema = ? and data_type = ? '.
+            ' and table_name in (?, ?, ?)',
+            [$databasename, 'json', 'default_life_event_types', 'life_event_types', 'life_events']
+        );
+        $tablePrefix = DB::connection()->getTablePrefix();
 
         foreach ($columns as $column) {
-            DB::statement('ALTER TABLE `'.$databasename.'`.`'.$column->table_name.'` MODIFY `'.$column->column_name.'` text;');
+            DB::statement('ALTER TABLE `'.$databasename.'`.`'.$tablePrefix.$column->table_name.'` MODIFY `'.$column->column_name.'` text;');
         }
     }
 }
diff --git a/storage/framework/testing/disks/public/testfile.vcf b/storage/framework/testing/disks/public/testfile.vcf