#145 Run upgrade process

danielbrendel · Mar 30, 2024 · 908f85a · 908f85a
1 parent a3e6f7c
commit 908f85a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/commands/MigrationUpgrade.php b/app/commands/MigrationUpgrade.php
@@ -13,18 +13,18 @@ class MigrationUpgrade implements Asatru\Commands\Command {
      */
     public function upgradeTo2dot5()
     {
-        PlantsModel::raw('ALTER TABLE `' . PlantsModel::tableName() . '` ADD COLUMN last_fertilised DATETIME NULL');
+        PlantsModel::raw('ALTER TABLE `' . PlantsModel::tableName() . '` ADD COLUMN IF NOT EXISTS last_fertilised DATETIME NULL');
 
-        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` ADD COLUMN notify_calendar BOOLEAN NOT NULL DEFAULT 1');
+        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` ADD COLUMN IF NOT EXISTS notify_calendar_reminder BOOLEAN NOT NULL DEFAULT 1');
     }
 
     /**
      * @return void
      */
     public function upgradeTo2dot4()
     {
-        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` DROP COLUMN session');
-        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` DROP COLUMN status');
+        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` DROP COLUMN IF EXISTS session');
+        UserModel::raw('ALTER TABLE `' . UserModel::tableName() . '` DROP COLUMN IF EXISTS status');
 
         PlantsModel::raw('ALTER TABLE `' . PlantsModel::tableName() . '` MODIFY COLUMN perennial BOOLEAN NULL');
         PlantsModel::raw('ALTER TABLE `' . PlantsModel::tableName() . '` MODIFY COLUMN humidity INT NULL');

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -172,6 +172,7 @@ if [ $(mysql -u "$DB_USERNAME" -p"$DB_PASSWORD" -h "$DB_HOST" -P "$DB_PORT" -D "
 then
     echo "Running unapplied database migrations..."
     php asatru migrate:list
+    php asatru migrate:upgrade
 else
     echo "Running full database migrations..."
     php asatru migrate:fresh