From dd1eaba7e5167655311025fd98c4122c42edbd9f Mon Sep 17 00:00:00 2001 From: Thomas von Deyen Date: Thu, 12 Sep 2024 19:48:41 +0200 Subject: [PATCH] Update to Alchemy 7.2 --- Gemfile | 6 ++--- Gemfile.lock | 22 +++++++++---------- ...te_alchemy_picture_descriptions.alchemy.rb | 12 ++++++++++ db/schema.rb | 14 +++++++++++- 4 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 db/migrate/20240912174734_create_alchemy_picture_descriptions.alchemy.rb diff --git a/Gemfile b/Gemfile index cb562b9..6004913 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "~> #{`cat .ruby-version`.chomp.tr("ruby-", "")}" -gem "alchemy_cms", "~> 7.1.0" -gem "alchemy-devise", "~> 7.1.0" -gem "alchemy_i18n", "~> 4.1.0" +gem "alchemy_cms", "~> 7.2.0" +gem "alchemy-devise", "~> 7.2.0" +gem "alchemy_i18n", "~> 4.2.0" gem "alchemy_cloudinary", "~> 3.0" gem "alchemy-sentry", "~> 1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 9146df7..190a90f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,9 +87,9 @@ GEM activesupport (>= 6.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - alchemy-devise (7.1.2) - alchemy_cms (>= 7.0.0, < 8) - devise (>= 4.7.1, < 5) + alchemy-devise (7.2.0) + alchemy_cms (~> 7.0) + devise (~> 4.9) alchemy-sentry (1.0.0) alchemy_cms (>= 4.6.7, < 8) sentry-rails (~> 5.0) @@ -97,7 +97,7 @@ GEM alchemy_cloudinary (3.0.0) alchemy_cms (>= 7.0, < 8.0) cloudinary (~> 1.9) - alchemy_cms (7.1.12) + alchemy_cms (7.2.6) actionmailer (>= 7.0, < 7.2) actionpack (>= 7.0, < 7.2) actionview (>= 7.0, < 7.2) @@ -120,14 +120,12 @@ GEM originator (~> 3.1) railties (>= 7.0, < 7.2) ransack (>= 1.8, < 5.0) - request_store (~> 1.2) - responders (>= 2.0, < 4.0) sassc-rails (~> 2.1) simple_form (>= 4.0, < 6) sprockets (>= 3.0, < 5) - turbo-rails (>= 1.4, < 2) + turbo-rails (>= 1.4, < 2.1) view_component (~> 3.0) - alchemy_i18n (4.1.3) + alchemy_i18n (4.2.2) alchemy_cms (>= 7.1.0.pre.b1, < 8) rails-i18n awesome_nested_set (3.7.0) @@ -383,7 +381,7 @@ GEM thor (1.3.2) tilt (2.4.0) timeout (0.4.1) - turbo-rails (1.5.0) + turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -415,11 +413,11 @@ PLATFORMS DEPENDENCIES activerecord-nulldb-adapter - alchemy-devise (~> 7.1.0) + alchemy-devise (~> 7.2.0) alchemy-sentry (~> 1.0) alchemy_cloudinary (~> 3.0) - alchemy_cms (~> 7.1.0) - alchemy_i18n (~> 4.1.0) + alchemy_cms (~> 7.2.0) + alchemy_i18n (~> 4.2.0) bootsnap (>= 1.1.0) database_cleaner (~> 2.0) dotenv-rails (~> 2.7) diff --git a/db/migrate/20240912174734_create_alchemy_picture_descriptions.alchemy.rb b/db/migrate/20240912174734_create_alchemy_picture_descriptions.alchemy.rb new file mode 100644 index 0000000..523a605 --- /dev/null +++ b/db/migrate/20240912174734_create_alchemy_picture_descriptions.alchemy.rb @@ -0,0 +1,12 @@ +# This migration comes from alchemy (originally 20240314105244) +class CreateAlchemyPictureDescriptions < ActiveRecord::Migration[7.0] + def change + create_table :alchemy_picture_descriptions do |t| + t.belongs_to :picture, null: false, foreign_key: {to_table: :alchemy_pictures} + t.belongs_to :language, null: false, foreign_key: {to_table: :alchemy_languages} + t.text :text + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2959988..6db5fea 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[7.0].define(version: 2024_02_22_143561) do +ActiveRecord::Schema[7.1].define(version: 2024_09_12_174734) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -353,6 +353,16 @@ t.index ["urlname"], name: "index_pages_on_urlname" end + create_table "alchemy_picture_descriptions", force: :cascade do |t| + t.bigint "picture_id", null: false + t.bigint "language_id", null: false + t.text "text" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["language_id"], name: "index_alchemy_picture_descriptions_on_language_id" + t.index ["picture_id"], name: "index_alchemy_picture_descriptions_on_picture_id" + end + create_table "alchemy_picture_thumbs", force: :cascade do |t| t.bigint "picture_id", null: false t.string "signature", null: false @@ -480,5 +490,7 @@ add_foreign_key "alchemy_page_mutexes", "alchemy_pages", column: "page_id" add_foreign_key "alchemy_page_versions", "alchemy_pages", column: "page_id", on_delete: :cascade add_foreign_key "alchemy_pages", "alchemy_languages", column: "language_id" + add_foreign_key "alchemy_picture_descriptions", "alchemy_languages", column: "language_id" + add_foreign_key "alchemy_picture_descriptions", "alchemy_pictures", column: "picture_id" add_foreign_key "alchemy_picture_thumbs", "alchemy_pictures", column: "picture_id" end