From 41eb906d86451f5cf3de92faeb97fc82c58be2cd Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 18 Mar 2024 11:20:14 +0100 Subject: [PATCH] Revert "Merge pull request #10121 from mfo/US/rails-pg-extra" This reverts commit f0053af54f52815e435577301f3bf843b41d7c32, reversing changes made to ca413a1035023be9bd3f6084db2bad18f0fd3567. --- Gemfile | 1 - Gemfile.lock | 7 ------- db/migrate/20240315065520_add_pg_extra_extensions.rb | 8 -------- db/schema.rb | 5 +---- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 db/migrate/20240315065520_add_pg_extra_extensions.rb diff --git a/Gemfile b/Gemfile index 20f244111..e2c2022b1 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,6 @@ gem 'puma' # Use Puma as the app server gem 'pundit' gem 'rack-attack' gem 'rails-i18n' # Locales par défaut -gem 'rails-pg-extras' gem 'rake-progressbar', require: false gem 'redcarpet' gem 'redis' diff --git a/Gemfile.lock b/Gemfile.lock index 97c723e27..4a2910f40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,9 +550,6 @@ GEM rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - rails-pg-extras (5.3.1) - rails - ruby-pg-extras (= 5.3.1) railties (7.0.8.1) actionpack (= 7.0.8.1) activesupport (= 7.0.8.1) @@ -643,9 +640,6 @@ GEM rubocop-factory_bot (~> 2.22) ruby-graphviz (1.2.5) rexml - ruby-pg-extras (5.3.1) - pg - terminal-table ruby-progressbar (1.13.0) ruby-vips (2.2.0) ffi (~> 1.12) @@ -915,7 +909,6 @@ DEPENDENCIES rails-controller-testing rails-erd rails-i18n - rails-pg-extras rake-progressbar redcarpet redis diff --git a/db/migrate/20240315065520_add_pg_extra_extensions.rb b/db/migrate/20240315065520_add_pg_extra_extensions.rb deleted file mode 100644 index 271dcc404..000000000 --- a/db/migrate/20240315065520_add_pg_extra_extensions.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddPgExtraExtensions < ActiveRecord::Migration[7.0] - def up - RailsPgExtras.add_extensions - end - - def down - end -end diff --git a/db/schema.rb b/db/schema.rb index df7de9250..a0c5b6233 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_03_15_065520) do +ActiveRecord::Schema[7.0].define(version: 2024_02_27_163855) do # These are extensions that must be enabled in order to support this database - enable_extension "pg_buffercache" - enable_extension "pg_stat_statements" enable_extension "pgcrypto" enable_extension "plpgsql" enable_extension "postgis" - enable_extension "sslinfo" enable_extension "unaccent" create_table "action_text_rich_texts", force: :cascade do |t|