fix db conflicts

3 files changed, 19 insertions, 3 deletions

diff --git a/db/migrations/20210612181508_init_referrals.js b/db/migrations/20210612181508_init_referrals.js
index f9107e15..ae07799d 100644
--- a/db/migrations/20210612181508_init_referrals.js
+++ b/db/migrations/20210612181508_init_referrals.js
@@ -14,7 +14,7 @@ exports.up = function(knex) {
       t.string('expiry').nullable();
       t.enum('status', ['available', 'used', 'expired', 'cancelled']).notNull().defaultTo('available');
   
-      t.timestamps();
+      t.timestamps(true, true);
     })
   ])
 };
diff --git a/db/migrations/20210612192804_init_waiting_list.js.js b/db/migrations/20210612192804_init_waiting_list.js.js
index 67762ff1..1e8d2be6 100644
--- a/db/migrations/20210612192804_init_waiting_list.js.js
+++ b/db/migrations/20210612192804_init_waiting_list.js.js
@@ -14,11 +14,11 @@ exports.up = function(knex) {
         t.foreign('user_id').references('users.id');
         t.text('notes').nullable();
 
-        t.timestamps();
+        t.timestamps(true, true);
       })
     ])
 }
   
 exports.down = function(knex) {
     return knex.schema.dropTable('waiting_list');
-}
\ No newline at end of file
+}
diff --git a/db/migrations/20210814193811_fix_db_conflicts.js b/db/migrations/20210814193811_fix_db_conflicts.js
new file mode 100644
index 00000000..37ff2bbc
--- /dev/null
+++ b/db/migrations/20210814193811_fix_db_conflicts.js
@@ -0,0 +1,16 @@
+
+exports.up = function(knex) {
+ return Promise.all([
+    knex.raw("UPDATE waiting_list set created_at = '2021-01-01', updated_at='2021-01-01' WHERE updated_at IS NULL OR created_at IS NULL"),
+    knex.raw("ALTER TABLE waiting_list MODIFY created_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP"),  
+    knex.raw("ALTER TABLE waiting_list MODIFY updated_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP"),  
+    
+    knex.raw("UPDATE referrals set created_at = '2021-01-01', updated_at='2021-01-01' WHERE updated_at IS NULL OR created_at IS NULL"),
+    knex.raw("ALTER TABLE referrals MODIFY created_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP"),  
+    knex.raw("ALTER TABLE referrals MODIFY updated_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP")  
+ ])
+};
+
+exports.down = function(knex) {
+  
+};