From ea129602b5186178049aff3eff7e8d4076ccaa29 Mon Sep 17 00:00:00 2001 From: Manuel Bustillo Date: Fri, 1 Nov 2024 19:10:11 +0100 Subject: [PATCH 1/4] Uninstall acts as taggable on gem --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Gemfile b/Gemfile index cb3135b..b02355a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' ruby '3.3.5' -gem 'acts-as-taggable-on' gem 'bootsnap', require: false gem 'csv' gem 'importmap-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 35e8250..34cdc5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,9 +72,6 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - acts-as-taggable-on (11.0.0) - activerecord (>= 7.0, < 8.0) - zeitwerk (>= 2.4, < 3.0) ast (2.4.2) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -315,7 +312,6 @@ PLATFORMS x86_64-linux DEPENDENCIES - acts-as-taggable-on bootsnap csv debug -- 2.47.1 From 5fef6f1011cbcd6345d39246bd09bf3eb1c940c8 Mon Sep 17 00:00:00 2001 From: Manuel Bustillo Date: Fri, 1 Nov 2024 19:12:34 +0100 Subject: [PATCH 2/4] Remove references to acts_as_taggable_on gem --- app/models/guest.rb | 1 - .../20241101181052_drop_taggable_tables.rb | 27 ++++++++++++++++++ db/schema.rb | 28 +------------------ db/seeds.rb | 2 -- 4 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 db/migrate/20241101181052_drop_taggable_tables.rb diff --git a/app/models/guest.rb b/app/models/guest.rb index 412f01c..39d27b3 100644 --- a/app/models/guest.rb +++ b/app/models/guest.rb @@ -1,7 +1,6 @@ # Copyright (C) 2024 Manuel Bustillo class Guest < ApplicationRecord - acts_as_taggable_on :affinity_groups, :unbreakable_bonds belongs_to :group enum status: { diff --git a/db/migrate/20241101181052_drop_taggable_tables.rb b/db/migrate/20241101181052_drop_taggable_tables.rb new file mode 100644 index 0000000..73191e8 --- /dev/null +++ b/db/migrate/20241101181052_drop_taggable_tables.rb @@ -0,0 +1,27 @@ +class DropTaggableTables < ActiveRecord::Migration[7.2] + def change + drop_table 'taggings', force: :cascade do |t| + t.bigint 'tag_id' + t.string 'taggable_type' + t.uuid 'taggable_id' + t.string 'tagger_type' + t.bigint 'tagger_id' + t.string 'context', limit: 128 + t.datetime 'created_at', precision: nil + t.string 'tenant', limit: 128 + t.index ['context'], name: 'index_taggings_on_context' + t.index %w[tag_id taggable_id taggable_type context tagger_id tagger_type], name: 'taggings_idx', + unique: true + t.index ['tag_id'], name: 'index_taggings_on_tag_id' + t.index %w[taggable_id taggable_type context], name: 'taggings_taggable_context_idx' + t.index %w[taggable_id taggable_type tagger_id context], name: 'taggings_idy' + t.index ['taggable_id'], name: 'index_taggings_on_taggable_id' + t.index %w[taggable_type taggable_id], name: 'index_taggings_on_taggable_type_and_taggable_id' + t.index ['taggable_type'], name: 'index_taggings_on_taggable_type' + t.index %w[tagger_id tagger_type], name: 'index_taggings_on_tagger_id_and_tagger_type' + t.index ['tagger_id'], name: 'index_taggings_on_tagger_id' + t.index %w[tagger_type tagger_id], name: 'index_taggings_on_tagger_type_and_tagger_id' + t.index ['tenant'], name: 'index_taggings_on_tenant' + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c81149..c6de811 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,5 +1,3 @@ -# Copyright (C) 2024 Manuel Bustillo - # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -12,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_08_11_170021) do +ActiveRecord::Schema[7.2].define(version: 2024_11_01_181052) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -67,29 +65,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_11_170021) do t.datetime "updated_at", null: false end - create_table "taggings", force: :cascade do |t| - t.bigint "tag_id" - t.string "taggable_type" - t.uuid "taggable_id" - t.string "tagger_type" - t.bigint "tagger_id" - t.string "context", limit: 128 - t.datetime "created_at", precision: nil - t.string "tenant", limit: 128 - t.index ["context"], name: "index_taggings_on_context" - t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true - t.index ["tag_id"], name: "index_taggings_on_tag_id" - t.index ["taggable_id", "taggable_type", "context"], name: "taggings_taggable_context_idx" - t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy" - t.index ["taggable_id"], name: "index_taggings_on_taggable_id" - t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id" - t.index ["taggable_type"], name: "index_taggings_on_taggable_type" - t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type" - t.index ["tagger_id"], name: "index_taggings_on_tagger_id" - t.index ["tagger_type", "tagger_id"], name: "index_taggings_on_tagger_type_and_tagger_id" - t.index ["tenant"], name: "index_taggings_on_tenant" - end - create_table "tags", force: :cascade do |t| t.string "name" t.datetime "created_at", null: false @@ -102,5 +77,4 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_11_170021) do add_foreign_key "guests", "groups" add_foreign_key "seats", "guests" add_foreign_key "seats", "tables_arrangements", on_delete: :cascade - add_foreign_key "taggings", "tags" end diff --git a/db/seeds.rb b/db/seeds.rb index 09d33f7..71b2a31 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,8 +5,6 @@ NUMBER_OF_GUESTS = 50 TablesArrangement.delete_all Expense.delete_all Guest.delete_all -ActsAsTaggableOn::Tagging.delete_all -ActsAsTaggableOn::Tag.delete_all Group.delete_all Expense.create!(name: 'Photographer', amount: 3000, pricing_type: 'fixed') -- 2.47.1 From eb85028eeabc55788e54793f2ef7630cd16205e3 Mon Sep 17 00:00:00 2001 From: Manuel Bustillo Date: Fri, 1 Nov 2024 18:14:32 +0000 Subject: [PATCH 3/4] Add copyright notice --- db/migrate/20241101181052_drop_taggable_tables.rb | 2 ++ db/schema.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/db/migrate/20241101181052_drop_taggable_tables.rb b/db/migrate/20241101181052_drop_taggable_tables.rb index 73191e8..95b7cd1 100644 --- a/db/migrate/20241101181052_drop_taggable_tables.rb +++ b/db/migrate/20241101181052_drop_taggable_tables.rb @@ -1,3 +1,5 @@ +# Copyright (C) 2024 Manuel Bustillo + class DropTaggableTables < ActiveRecord::Migration[7.2] def change drop_table 'taggings', force: :cascade do |t| diff --git a/db/schema.rb b/db/schema.rb index c6de811..b2706f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,3 +1,5 @@ +# Copyright (C) 2024 Manuel Bustillo + # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. -- 2.47.1 From bf970af2c503d163cf6fcd52368409c08d7fdb7b Mon Sep 17 00:00:00 2001 From: Manuel Bustillo Date: Fri, 1 Nov 2024 19:15:08 +0100 Subject: [PATCH 4/4] Remove tags table as well --- db/migrate/20241101181052_drop_taggable_tables.rb | 8 ++++++++ db/schema.rb | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/db/migrate/20241101181052_drop_taggable_tables.rb b/db/migrate/20241101181052_drop_taggable_tables.rb index 95b7cd1..cce88c7 100644 --- a/db/migrate/20241101181052_drop_taggable_tables.rb +++ b/db/migrate/20241101181052_drop_taggable_tables.rb @@ -25,5 +25,13 @@ class DropTaggableTables < ActiveRecord::Migration[7.2] t.index %w[tagger_type tagger_id], name: 'index_taggings_on_tagger_type_and_tagger_id' t.index ['tenant'], name: 'index_taggings_on_tenant' end + + drop_table "tags", force: :cascade do |t| + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "taggings_count", default: 0 + t.index ["name"], name: "index_tags_on_name", unique: true + end end end diff --git a/db/schema.rb b/db/schema.rb index b2706f2..172be0b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -67,14 +67,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_11_01_181052) do t.datetime "updated_at", null: false end - create_table "tags", force: :cascade do |t| - t.string "name" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "taggings_count", default: 0 - t.index ["name"], name: "index_tags_on_name", unique: true - end - add_foreign_key "groups", "groups", column: "parent_id" add_foreign_key "guests", "groups" add_foreign_key "seats", "guests" -- 2.47.1