From 26089f77b7a23e3bf9cbd585b4e33a0a7a246f3c Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Tue, 22 Jul 2025 15:23:39 +0200 Subject: [PATCH] Remove unused column and rename contents => content --- app/models/event/activity_summary.rb | 4 +- ...name_column_in_event_activity_summaries.rb | 6 +++ db/schema.rb | 5 +- db/schema_cache.yml | 54 ++++++++----------- 4 files changed, 32 insertions(+), 37 deletions(-) create mode 100644 db/migrate/20250722132226_remove_data_and_rename_column_in_event_activity_summaries.rb diff --git a/app/models/event/activity_summary.rb b/app/models/event/activity_summary.rb index bb0809812..78b0f4e4f 100644 --- a/app/models/event/activity_summary.rb +++ b/app/models/event/activity_summary.rb @@ -11,7 +11,7 @@ class Event::ActivitySummary < ApplicationRecord key = key_for(events) unless find_by key: key - create!(key: key, contents: summary) + create!(key: key, content: summary) end end @@ -27,7 +27,7 @@ class Event::ActivitySummary < ApplicationRecord def to_html renderer = Redcarpet::Render::HTML.new markdowner = Redcarpet::Markdown.new(renderer, autolink: true, tables: true, fenced_code_blocks: true, strikethrough: true, superscript: true,) - markdowner.render(contents).html_safe + markdowner.render(content).html_safe end private diff --git a/db/migrate/20250722132226_remove_data_and_rename_column_in_event_activity_summaries.rb b/db/migrate/20250722132226_remove_data_and_rename_column_in_event_activity_summaries.rb new file mode 100644 index 000000000..b49e5ce9e --- /dev/null +++ b/db/migrate/20250722132226_remove_data_and_rename_column_in_event_activity_summaries.rb @@ -0,0 +1,6 @@ +class RemoveDataAndRenameColumnInEventActivitySummaries < ActiveRecord::Migration[8.1] + def change + remove_column :event_activity_summaries, :data, :jsonb + rename_column :event_activity_summaries, :contents, :content + end +end diff --git a/db/schema.rb b/db/schema.rb index 96a1d01a9..03cc51766 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.1].define(version: 2025_07_21_110000) do +ActiveRecord::Schema[8.1].define(version: 2025_07_22_132226) do create_table "accesses", force: :cascade do |t| t.datetime "accessed_at" t.integer "collection_id", null: false @@ -226,9 +226,8 @@ ActiveRecord::Schema[8.1].define(version: 2025_07_21_110000) do end create_table "event_activity_summaries", force: :cascade do |t| - t.text "contents", null: false + t.text "content", null: false t.datetime "created_at", null: false - t.json "data", default: {} t.string "key", null: false t.datetime "updated_at", null: false t.index ["key"], name: "index_event_activity_summaries_on_key", unique: true diff --git a/db/schema_cache.yml b/db/schema_cache.yml index b1fc41d2a..a90d62239 100644 --- a/db/schema_cache.yml +++ b/db/schema_cache.yml @@ -532,11 +532,11 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: all_access - cast_type: &31 !ruby/object:ActiveModel::Type::Boolean + cast_type: &30 !ruby/object:ActiveModel::Type::Boolean precision: scale: limit: - sql_type_metadata: &32 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata + sql_type_metadata: &31 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata sql_type: boolean type: :boolean limit: @@ -567,14 +567,14 @@ columns: - *19 commands: - *5 - - &26 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: data - cast_type: &27 !ruby/object:ActiveRecord::Type::Json + cast_type: &26 !ruby/object:ActiveRecord::Type::Json precision: scale: limit: - sql_type_metadata: &28 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata + sql_type_metadata: &27 !ruby/object:ActiveRecord::ConnectionAdapters::SqlTypeMetadata sql_type: json type: :json limit: @@ -672,9 +672,9 @@ columns: - *6 - *9 event_activity_summaries: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &32 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: - name: contents + name: content cast_type: *15 sql_type_metadata: *16 'null': false @@ -683,7 +683,6 @@ columns: collation: comment: - *5 - - *26 - *6 - *18 - *9 @@ -725,8 +724,8 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: particulars - cast_type: *27 - sql_type_metadata: *28 + cast_type: *26 + sql_type_metadata: *27 'null': true default: "{}" default_function: @@ -739,8 +738,8 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: fields - cast_type: *27 - sql_type_metadata: *28 + cast_type: *26 + sql_type_metadata: *27 'null': false default: "{}" default_function: @@ -805,7 +804,7 @@ columns: default_function: collation: comment: - - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &28 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: source_id cast_type: *3 @@ -815,7 +814,7 @@ columns: default_function: collation: comment: - - &30 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column + - &29 !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: source_type cast_type: *7 @@ -849,8 +848,8 @@ columns: default_function: collation: comment: + - *28 - *29 - - *30 - *9 - *25 pins: @@ -973,23 +972,14 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: completed - cast_type: *31 - sql_type_metadata: *32 + cast_type: *30 + sql_type_metadata: *31 'null': false default: false default_function: collation: comment: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: content - cast_type: *15 - sql_type_metadata: *16 - 'null': false - default: - default_function: - collation: - comment: + - *32 - *5 - *6 - *9 @@ -1008,8 +998,8 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: active - cast_type: *31 - sql_type_metadata: *32 + cast_type: *30 + sql_type_metadata: *31 'null': false default: true default_function: @@ -1068,8 +1058,8 @@ columns: - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column auto_increment: name: watching - cast_type: *31 - sql_type_metadata: *32 + cast_type: *30 + sql_type_metadata: *31 'null': false default: true default_function: @@ -2551,4 +2541,4 @@ indexes: comment: valid: true workflows: [] -version: 20250721110000 +version: 20250722132226