diff --git a/Gemfile b/Gemfile index 84f9cd1..dfd24e0 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "jbuilder" # Use Redis adapter to run Action Cable in production # gem "redis", ">= 4.0.1" -gem "solid_queue" +gem "solid_queue", "= 0.6.0" # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis] # gem "kredis" diff --git a/Gemfile.lock b/Gemfile.lock index b76edaf..ddae94d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,7 +161,7 @@ GEM activesupport (>= 5.0.0) json (2.7.2) language_server-protocol (3.17.0.3) - logger (1.6.0) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -222,7 +222,7 @@ GEM rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) - reline (0.5.9) + reline (0.5.10) io-console (~> 0.5) rexml (3.3.5) strscan @@ -264,7 +264,7 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - solid_queue (0.5.0) + solid_queue (0.6.0) activejob (>= 7.1) activerecord (>= 7.1) concurrent-ruby (>= 1.3.1) @@ -283,7 +283,7 @@ GEM railties (>= 7.0.0) tailwindcss-rails (2.7.3-x86_64-linux) railties (>= 7.0.0) - thor (1.3.1) + thor (1.3.2) timeout (0.4.1) turbo-rails (2.0.6) actionpack (>= 6.0.0) @@ -305,7 +305,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS aarch64-linux @@ -325,7 +325,7 @@ DEPENDENCIES rails! rubocop-rails-omakase selenium-webdriver - solid_queue + solid_queue (= 0.6.0) sqlite3 (>= 1.4) stimulus-rails tailwindcss-rails (~> 2.0) diff --git a/db/migrate/20240909011042_add_name_to_processes.solid_queue.rb b/db/migrate/20240909011042_add_name_to_processes.solid_queue.rb new file mode 100644 index 0000000..d5c14cd --- /dev/null +++ b/db/migrate/20240909011042_add_name_to_processes.solid_queue.rb @@ -0,0 +1,6 @@ +# This migration comes from solid_queue (originally 20240811173327) +class AddNameToProcesses < ActiveRecord::Migration[7.1] + def change + add_column :solid_queue_processes, :name, :string + end +end diff --git a/db/migrate/20240909011043_make_name_not_null.solid_queue.rb b/db/migrate/20240909011043_make_name_not_null.solid_queue.rb new file mode 100644 index 0000000..d1dcc6b --- /dev/null +++ b/db/migrate/20240909011043_make_name_not_null.solid_queue.rb @@ -0,0 +1,17 @@ +# This migration comes from solid_queue (originally 20240813160053) +class MakeNameNotNull < ActiveRecord::Migration[7.1] + def up + SolidQueue::Process.where(name: nil).find_each do |process| + process.name ||= [ process.kind.downcase, SecureRandom.hex(10) ].join("-") + process.save! + end + + change_column :solid_queue_processes, :name, :string, null: false + add_index :solid_queue_processes, [ :name, :supervisor_id ], unique: true + end + + def down + remove_index :solid_queue_processes, [ :name, :supervisor_id ] + change_column :solid_queue_processes, :name, :string, null: false + end +end diff --git a/db/migrate/20240909011044_change_solid_queue_recurring_tasks_static_to_not_null.solid_queue.rb b/db/migrate/20240909011044_change_solid_queue_recurring_tasks_static_to_not_null.solid_queue.rb new file mode 100644 index 0000000..325320a --- /dev/null +++ b/db/migrate/20240909011044_change_solid_queue_recurring_tasks_static_to_not_null.solid_queue.rb @@ -0,0 +1,6 @@ +# This migration comes from solid_queue (originally 20240819165045) +class ChangeSolidQueueRecurringTasksStaticToNotNull < ActiveRecord::Migration[7.1] + def change + change_column_null :solid_queue_recurring_tasks, :static, false, true + end +end diff --git a/db/schema.rb b/db/schema.rb index f03ca23..1637c09 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.0].define(version: 2024_08_17_015831) do +ActiveRecord::Schema[8.0].define(version: 2024_09_09_011044) do create_table "credit_card_bills", force: :cascade do |t| t.string "description" t.decimal "amount" @@ -104,7 +104,9 @@ ActiveRecord::Schema[8.0].define(version: 2024_08_17_015831) do t.string "hostname" t.text "metadata" t.datetime "created_at", null: false + t.string "name", null: false t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at" + t.index ["name", "supervisor_id"], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id" end @@ -135,7 +137,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_08_17_015831) do t.text "arguments" t.string "queue_name" t.integer "priority", default: 0 - t.boolean "static", default: true + t.boolean "static", default: true, null: false t.text "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false