Merge pull request #3437 from ushahidi/use-mysql-strict

Use mysql strict mode
ushahidi · Dec 6, 2018 · 48b6893 · 48b6893
2 parents e9fda73 + 1219632
commit 48b6893
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/config/database.php b/config/database.php
@@ -68,7 +68,7 @@
             'collation' => env('DB_COLLATION', 'utf8_unicode_ci'),
             'prefix'    => env('DB_PREFIX', ''),
             'timezone'  => env('DB_TIMEZONE', '+00:00'),
-            'strict'    => env('DB_STRICT_MODE', false),
+            'strict'    => env('DB_STRICT_MODE', true),
         ],
 
         'pgsql' => [
@@ -104,7 +104,7 @@
             'collation' => env('DB_COLLATION', 'utf8_unicode_ci'),
             'prefix'    => env('DB_PREFIX', ''),
             'timezone'  => env('DB_TIMEZONE', '+00:00'),
-            'strict'    => env('DB_STRICT_MODE', false),
+            'strict'    => env('DB_STRICT_MODE', true),
         ],
 
     ],

diff --git a/migrations/20181206211859_allow_null_export_batch_filename.php b/migrations/20181206211859_allow_null_export_batch_filename.php
@@ -0,0 +1,21 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AllowNullExportBatchFilename extends AbstractMigration
+{
+    public function up()
+    {
+        $this->table('export_batches')
+            ->changeColumn('filename', 'string', [
+                'default' => '',
+                'null' => true
+            ])
+            ->update();
+    }
+
+    public function down()
+    {
+        // No op. Don't reverse this or it causes bugs
+    }
+}