From ed6173df20d4e8fae0ddbaa508d7fe605fff5d9a Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Wed, 17 Dec 2025 10:58:15 -0500 Subject: [PATCH 1/3] fix empty_trash task --- card/mod/core/lib/tasks/card/trash.rake | 2 +- docker/template/config/database.yml.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/card/mod/core/lib/tasks/card/trash.rake b/card/mod/core/lib/tasks/card/trash.rake index be45e293fe..f85204fc46 100644 --- a/card/mod/core/lib/tasks/card/trash.rake +++ b/card/mod/core/lib/tasks/card/trash.rake @@ -1,7 +1,7 @@ namespace :card do namespace :trash do desc "empty trash" - task :empty do + task empty: :environment do Cardio::Utils.empty_trash end end diff --git a/docker/template/config/database.yml.erb b/docker/template/config/database.yml.erb index f661c457ea..eccaa9dbb7 100644 --- a/docker/template/config/database.yml.erb +++ b/docker/template/config/database.yml.erb @@ -1,4 +1,4 @@ -production: +production: &production host: db database: deckdb username: <%= username %> @@ -6,5 +6,5 @@ production: adapter: <%= adapter %> encoding: utf8 - reconnect: false pool: 5 +development: *production From 5add01e71d7d3cbf4fe457f654df8572ced0c904 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Wed, 17 Dec 2025 16:01:07 -0500 Subject: [PATCH 2/3] if exists on table drops --- .../core/data/schema/20251110200407_remove_legacy_tables.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb b/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb index 2143bc497d..9263e4f651 100644 --- a/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb +++ b/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb @@ -2,9 +2,9 @@ class RemoveLegacyTables < Cardio::Migration::Schema def up - drop_table :card_revisions - drop_table :users - drop_table :sessions + drop_table :card_revisions, if_exists: true + drop_table :users, if_exists: true + drop_table :sessions, if_exists: true remove_column :cards, :current_revision_id remove_column :cards, :references_expired end From 4a7fe0f178afdd83434750d3ba1019d3a9edb3b7 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Wed, 17 Dec 2025 18:37:58 -0500 Subject: [PATCH 3/3] remove column with rescue --- .../data/schema/20251110200407_remove_legacy_tables.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb b/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb index 9263e4f651..5e4c9881f3 100644 --- a/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb +++ b/card/mod/core/data/schema/20251110200407_remove_legacy_tables.rb @@ -5,7 +5,13 @@ def up drop_table :card_revisions, if_exists: true drop_table :users, if_exists: true drop_table :sessions, if_exists: true - remove_column :cards, :current_revision_id - remove_column :cards, :references_expired + remove_column_with_rescue :cards, :current_revision_id + remove_column_with_rescue :cards, :references_expired + end + + def remove_column_with_rescue *args + remove_column *args + rescue StandardError + puts "failed to remove column #{args}" end end