From 2d2cd702caa7b7b1be76b9a8f57cc3d181a1762c Mon Sep 17 00:00:00 2001 From: Jorge Manrubia Date: Wed, 30 Apr 2025 10:18:02 +0200 Subject: [PATCH] Remove summary id column too --- ...429162506_flatten_messages_and_comments.rb | 1 + db/schema.rb | 5 ++-- db/schema_cache.yml | 29 +++++++++++-------- script/generate_comments_from_events.rb | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/db/migrate/20250429162506_flatten_messages_and_comments.rb b/db/migrate/20250429162506_flatten_messages_and_comments.rb index f2a777ae8..090a0201e 100644 --- a/db/migrate/20250429162506_flatten_messages_and_comments.rb +++ b/db/migrate/20250429162506_flatten_messages_and_comments.rb @@ -13,6 +13,7 @@ class FlattenMessagesAndComments < ActiveRecord::Migration[8.1] ) SQL + remove_column :events, :summary_id change_column_null :comments, :card_id, false drop_table :messages drop_table :event_summaries diff --git a/db/schema.rb b/db/schema.rb index e12769463..fd3176781 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -182,12 +182,11 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do t.integer "eventable_id", null: false t.string "eventable_type", null: false t.json "particulars", default: {} - t.integer "summary_id" t.datetime "updated_at", null: false + t.index ["action"], name: "index_events_on_summary_id_and_action" t.index ["collection_id"], name: "index_events_on_collection_id" t.index ["creator_id"], name: "index_events_on_creator_id" t.index ["eventable_type", "eventable_id"], name: "index_events_on_eventable" - t.index ["summary_id", "action"], name: "index_events_on_summary_id_and_action" end create_table "filters", force: :cascade do |t| @@ -281,6 +280,7 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do t.datetime "created_at", null: false t.string "title" t.datetime "updated_at", null: false + t.index ["title"], name: "index_tags_on_account_id_and_title", unique: true end create_table "users", force: :cascade do |t| @@ -329,7 +329,6 @@ ActiveRecord::Schema[8.1].define(version: 2025_04_29_162506) do add_foreign_key "collections", "workflows" add_foreign_key "comments", "cards" add_foreign_key "events", "collections" - add_foreign_key "events", "event_summaries", column: "summary_id" add_foreign_key "mentions", "users", column: "mentionee_id" add_foreign_key "mentions", "users", column: "mentioner_id" add_foreign_key "notifications", "users" diff --git a/db/schema_cache.yml b/db/schema_cache.yml index ce6fc968a..c196953f7 100644 --- a/db/schema_cache.yml +++ b/db/schema_cache.yml @@ -594,16 +594,6 @@ columns: default_function: collation: comment: - - !ruby/object:ActiveRecord::ConnectionAdapters::SQLite3::Column - auto_increment: - name: summary_id - cast_type: *1 - sql_type_metadata: *2 - 'null': true - default: - default_function: - collation: - comment: - *9 filters: - *5 @@ -1565,7 +1555,6 @@ indexes: name: index_events_on_summary_id_and_action unique: false columns: - - summary_id - action lengths: {} orders: {} @@ -1916,7 +1905,23 @@ indexes: nulls_not_distinct: comment: valid: true - tags: [] + tags: + - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition + table: tags + name: index_tags_on_account_id_and_title + unique: true + columns: + - title + lengths: {} + orders: {} + opclasses: {} + where: + type: + using: + include: + nulls_not_distinct: + comment: + valid: true users: - !ruby/object:ActiveRecord::ConnectionAdapters::IndexDefinition table: users diff --git a/script/generate_comments_from_events.rb b/script/generate_comments_from_events.rb index 5081fdf19..d1b5aecb9 100755 --- a/script/generate_comments_from_events.rb +++ b/script/generate_comments_from_events.rb @@ -5,7 +5,7 @@ require_relative "../config/environment" ApplicationRecord.with_each_tenant do |tenant| Card.find_each do |card| card.events.find_each do |event| - Card::Eventable::SystemCommenter.new(card, event).comment + Card::Eventable::SystemCommenter.new(card.reload, event).comment end end end