From 6b70006aabd590f9932ed6c6a74acf8759d2821e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= Date: Wed, 17 Mar 2021 15:44:44 +0100 Subject: [PATCH 1/3] test hastag map --- Gemfile | 3 +- Gemfile.lock | 230 +++++++++--------- ..._all_sessions_for_deleted_users.decidim.rb | 12 + ..._proposals_after_copy.decidim_proposals.rb | 15 ++ db/schema.rb | 2 +- 5 files changed, 148 insertions(+), 114 deletions(-) create mode 100644 db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb create mode 100644 db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb diff --git a/Gemfile b/Gemfile index 0f64fcd..15ccfd3 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,8 @@ gem "decidim-conferences", DECIDIM_VERSION gem "decidim-consultations", DECIDIM_VERSION gem "decidim-templates", DECIDIM_VERSION -gem "decidim-decidim_awesome", "~> 0.6.4" +# gem "decidim-decidim_awesome", "~> 0.6.4" +gem "decidim-decidim_awesome", git: "https://github.com/Platoniq/decidim-module-decidim_awesome", branch: "feature/hashtags-map-search" gem "decidim-notify", "~> 0.3.0" gem "decidim-term_customizer", git: "https://github.com/Platoniq/decidim-module-term_customizer", branch: "temp/0.23" diff --git a/Gemfile.lock b/Gemfile.lock index c7ae17a..4e24762 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/Platoniq/decidim-module-decidim_awesome + revision: fe5b2a856054a1120e3fb6fc4be7783e7c726e10 + branch: feature/hashtags-map-search + specs: + decidim-decidim_awesome (0.6.6) + decidim-admin (>= 0.22.0, < 0.24) + decidim-core (>= 0.22.0, < 0.24) + redcarpet (~> 3.4) + GIT remote: https://github.com/Platoniq/decidim-module-term_customizer revision: 161bcbb4364cd265af8eeceed3f393f196136564 @@ -9,77 +19,77 @@ GIT GIT remote: https://github.com/decidim/decidim - revision: 26470b2568c6c39aa22270af5bb01aaea7a64a8f + revision: d4a482d6b2927c1a1b01d3f7be66115e997eb50a branch: release/0.23-stable specs: - decidim (0.23.2) - decidim-accountability (= 0.23.2) - decidim-admin (= 0.23.2) - decidim-api (= 0.23.2) - decidim-assemblies (= 0.23.2) - decidim-blogs (= 0.23.2) - decidim-budgets (= 0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) - decidim-debates (= 0.23.2) - decidim-forms (= 0.23.2) - decidim-generators (= 0.23.2) - decidim-meetings (= 0.23.2) - decidim-pages (= 0.23.2) - decidim-participatory_processes (= 0.23.2) - decidim-proposals (= 0.23.2) - decidim-sortitions (= 0.23.2) - decidim-surveys (= 0.23.2) - decidim-system (= 0.23.2) - decidim-verifications (= 0.23.2) - decidim-accountability (0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) + decidim (0.23.4) + decidim-accountability (= 0.23.4) + decidim-admin (= 0.23.4) + decidim-api (= 0.23.4) + decidim-assemblies (= 0.23.4) + decidim-blogs (= 0.23.4) + decidim-budgets (= 0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) + decidim-debates (= 0.23.4) + decidim-forms (= 0.23.4) + decidim-generators (= 0.23.4) + decidim-meetings (= 0.23.4) + decidim-pages (= 0.23.4) + decidim-participatory_processes (= 0.23.4) + decidim-proposals (= 0.23.4) + decidim-sortitions (= 0.23.4) + decidim-surveys (= 0.23.4) + decidim-system (= 0.23.4) + decidim-verifications (= 0.23.4) + decidim-accountability (0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) kaminari (~> 1.2, >= 1.2.1) searchlight (~> 4.1) - decidim-admin (0.23.2) + decidim-admin (0.23.4) active_link_to (~> 1.0) - decidim-core (= 0.23.2) + decidim-core (= 0.23.4) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) sassc (~> 2.3.0) sassc-rails (~> 2.1.2) - decidim-api (0.23.2) + decidim-api (0.23.4) graphiql-rails (~> 1.4, < 1.5) graphql (~> 1.9) rack-cors (~> 1.0) redcarpet (~> 3.4) sprockets-es6 (~> 0.9.2) - decidim-assemblies (0.23.2) - decidim-core (= 0.23.2) - decidim-blogs (0.23.2) - decidim-admin (= 0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) + decidim-assemblies (0.23.4) + decidim-core (= 0.23.4) + decidim-blogs (0.23.4) + decidim-admin (= 0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) httparty (~> 0.17) jquery-tmpl-rails (~> 1.1) kaminari (~> 1.2, >= 1.2.1) - decidim-budgets (0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) + decidim-budgets (0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) kaminari (~> 1.2, >= 1.2.1) searchlight (~> 4.1) - decidim-comments (0.23.2) - decidim-core (= 0.23.2) + decidim-comments (0.23.4) + decidim-core (= 0.23.4) jquery-rails (~> 4.3) redcarpet (~> 3.4) - decidim-conferences (0.23.2) - decidim-core (= 0.23.2) - decidim-meetings (= 0.23.2) + decidim-conferences (0.23.4) + decidim-core (= 0.23.4) + decidim-meetings (= 0.23.4) wicked_pdf (~> 1.4) wkhtmltopdf-binary (~> 0.12) - decidim-consultations (0.23.2) - decidim-admin (= 0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) - decidim-core (0.23.2) + decidim-consultations (0.23.4) + decidim-admin (= 0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) + decidim-core (0.23.4) active_link_to (~> 1.0) anchored (>= 1.1.0) autoprefixer-rails (~> 8.0) @@ -90,7 +100,7 @@ GIT cells-rails (~> 0.0.9) charlock_holmes (~> 0.7) date_validator (~> 0.9.0) - decidim-api (= 0.23.2) + decidim-api (= 0.23.4) devise (~> 4.7) devise-i18n (~> 1.2) diffy (~> 3.3) @@ -137,16 +147,16 @@ GIT uglifier (~> 4.1) valid_email2 (~> 2.1) wisper (~> 2.0) - decidim-debates (0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) + decidim-debates (0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) kaminari (~> 1.2, >= 1.2.1) searchlight (~> 4.1) - decidim-dev (0.23.2) + decidim-dev (0.23.4) byebug (~> 11.0) capybara (~> 3.24) db-query-matchers (~> 0.9.0) - decidim (= 0.23.2) + decidim (= 0.23.4) erb_lint (~> 0.0.28) factory_bot_rails (~> 4.8) i18n-tasks (~> 0.9.18) @@ -168,58 +178,58 @@ GIT system_test_html_screenshots (~> 0.1.1) webmock (~> 3.6) wisper-rspec (~> 1.0) - decidim-forms (0.23.2) - decidim-core (= 0.23.2) + decidim-forms (0.23.4) + decidim-core (= 0.23.4) wicked_pdf (~> 1.4) wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.23.2) - decidim-core (= 0.23.2) - decidim-meetings (0.23.2) + decidim-generators (0.23.4) + decidim-core (= 0.23.4) + decidim-meetings (0.23.4) cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) - decidim-core (= 0.23.2) - decidim-forms (= 0.23.2) + decidim-core (= 0.23.4) + decidim-forms (= 0.23.4) httparty (~> 0.17) icalendar (~> 2.5) jquery-tmpl-rails (~> 1.1) kaminari (~> 1.2, >= 1.2.1) searchlight (~> 4.1) - decidim-pages (0.23.2) - decidim-core (= 0.23.2) - decidim-participatory_processes (0.23.2) - decidim-core (= 0.23.2) - decidim-proposals (0.23.2) + decidim-pages (0.23.4) + decidim-core (= 0.23.4) + decidim-participatory_processes (0.23.4) + decidim-core (= 0.23.4) + decidim-proposals (0.23.4) acts_as_list (~> 0.9) cells-erb (~> 0.1.0) cells-rails (~> 0.0.9) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) doc2text (~> 0.4.2) kaminari (~> 1.2, >= 1.2.1) ransack (~> 2.1.1) redcarpet (~> 3.4) - decidim-sortitions (0.23.2) - decidim-admin (= 0.23.2) - decidim-comments (= 0.23.2) - decidim-core (= 0.23.2) - decidim-proposals (= 0.23.2) - decidim-surveys (0.23.2) - decidim-core (= 0.23.2) - decidim-forms (= 0.23.2) - decidim-system (0.23.2) + decidim-sortitions (0.23.4) + decidim-admin (= 0.23.4) + decidim-comments (= 0.23.4) + decidim-core (= 0.23.4) + decidim-proposals (= 0.23.4) + decidim-surveys (0.23.4) + decidim-core (= 0.23.4) + decidim-forms (= 0.23.4) + decidim-system (0.23.4) active_link_to (~> 1.0) - decidim-core (= 0.23.2) + decidim-core (= 0.23.4) devise (~> 4.7) devise-i18n (~> 1.2) devise_invitable (~> 1.7) jquery-rails (~> 4.3) sassc (~> 2.3.0) sassc-rails (~> 2.1.2) - decidim-templates (0.23.2) - decidim-core (= 0.23.2) - decidim-forms (= 0.23.2) - decidim-verifications (0.23.2) - decidim-core (= 0.23.2) + decidim-templates (0.23.4) + decidim-core (= 0.23.4) + decidim-forms (= 0.23.4) + decidim-verifications (0.23.4) + decidim-core (= 0.23.4) GEM remote: https://rubygems.org/ @@ -303,7 +313,7 @@ GEM browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capistrano (3.15.0) + capistrano (3.16.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -346,7 +356,7 @@ GEM actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chef-utils (16.10.8) + chef-utils (16.10.17) childprocess (3.0.0) chronic (0.10.2) coercible (1.0.0) @@ -371,22 +381,18 @@ GEM db-query-matchers (0.9.0) activesupport (>= 4.0, <= 6.0) rspec (~> 3.0) - decidim-decidim_awesome (0.6.4) - decidim-admin (>= 0.22.0, < 0.24) - decidim-core (>= 0.22.0, < 0.24) - redcarpet (~> 3.4) decidim-notify (0.3) decidim-admin (>= 0.21) decidim-core (>= 0.21) declarative-builder (0.1.0) declarative-option (< 0.2.0) - declarative-option (0.1.0) + declarative-option (0.1.1) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) delayed_job_active_record (4.1.5) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - delayed_job_web (1.4.3) + delayed_job_web (1.4.4) activerecord (> 3.0.0) delayed_job (> 2.0.3) rack-protection (>= 1.5.5) @@ -399,7 +405,7 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.9.2) + devise-i18n (1.9.3) devise (>= 4.7.1) devise_invitable (1.7.5) actionmailer (>= 4.1.0) @@ -412,7 +418,7 @@ GEM docile (1.3.5) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.4.0) + doorkeeper (5.5.0) railties (>= 5) doorkeeper-i18n (4.0.1) equalizer (0.0.11) @@ -442,7 +448,7 @@ GEM multipart-post (>= 1.2, < 3) ruby2_keywords faraday-net_http (1.0.1) - ffi (1.14.2) + ffi (1.15.0) figaro (1.2.0) thor (>= 0.14.0, < 2) file_validators (2.3.0) @@ -458,13 +464,13 @@ GEM activesupport (>= 4.1, < 6.0) railties (>= 4.1, < 6.0) tzinfo (~> 1.2, >= 1.2.2) - geocoder (1.6.5) + geocoder (1.6.6) globalid (0.4.2) activesupport (>= 4.2.0) graphiql-rails (1.4.11) railties sprockets-rails - graphql (1.12.4) + graphql (1.12.6) hashdiff (1.0.1) hashie (4.1.0) highline (2.0.3) @@ -478,7 +484,7 @@ GEM multi_xml (>= 0.5.2) i18n (1.8.9) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.33) + i18n-tasks (0.9.34) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -488,7 +494,7 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.7.0) + icalendar (2.7.1) ice_cube (~> 0.16) ice_cube (0.16.3) ice_nine (0.11.2) @@ -545,12 +551,12 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0212) + mime-types-data (3.2021.0225) mimemagic (0.3.5) mini_magick (4.11.0) mini_mime (1.0.2) mini_portile2 (2.5.0) - minitest (5.14.3) + minitest (5.14.4) mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb @@ -567,9 +573,9 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) netrc (0.11.0) - nio4r (2.5.5) + nio4r (2.5.7) nobspw (0.6.2) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) oauth (0.5.5) @@ -584,10 +590,10 @@ GEM rack (>= 1.6.2, < 3) omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.8.1) + omniauth-google-oauth2 (0.8.2) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (>= 1.1.1) + omniauth (~> 1.1) omniauth-oauth2 (>= 1.6) omniauth-oauth (1.2.0) oauth @@ -623,7 +629,7 @@ GEM actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) public_suffix (4.0.6) - puma (5.2.1) + puma (5.2.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -684,7 +690,7 @@ GEM wisper (>= 1.6.1) redcarpet (3.5.1) redis (4.2.5) - regexp_parser (2.0.3) + regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -760,14 +766,14 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-rails (4.2.1) + sentry-rails (4.3.0) rails (>= 5.0) - sentry-ruby-core (~> 4.2.0) - sentry-ruby (4.2.1) + sentry-ruby-core (~> 4.3.0) + sentry-ruby (4.3.0) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) - sentry-ruby-core (= 4.2.1) - sentry-ruby-core (4.2.1) + sentry-ruby-core (= 4.3.0) + sentry-ruby-core (4.3.0) concurrent-ruby faraday seven_zip_ruby (1.3.0) @@ -785,7 +791,7 @@ GEM smart_properties (1.15.0) social-share-button (1.2.3) coffee-rails - spreadsheet (1.2.7) + spreadsheet (1.2.8) ruby-ole spring (2.1.1) spring-watcher-listen (2.0.1) @@ -844,7 +850,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.11.2) + webmock (3.12.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -877,7 +883,7 @@ DEPENDENCIES decidim! decidim-conferences! decidim-consultations! - decidim-decidim_awesome (~> 0.6.4) + decidim-decidim_awesome! decidim-dev! decidim-notify (~> 0.3.0) decidim-templates! diff --git a/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb b/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb new file mode 100644 index 0000000..b4acff9 --- /dev/null +++ b/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true +# This migration comes from decidim (originally 20210302150803) + +class InvalidateAllSessionsForDeletedUsers < ActiveRecord::Migration[5.2] + def up + Decidim::User.reset_column_information + + Decidim::User.where.not(deleted_at: nil).find_each(&:invalidate_all_sessions!) + end + + def down; end +end diff --git a/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb b/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb new file mode 100644 index 0000000..93105d8 --- /dev/null +++ b/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true +# This migration comes from decidim_proposals (originally 20210127115628) + +class FixAnsweredProposalsAfterCopy < ActiveRecord::Migration[5.2] + def change + proposals_after_copy = Decidim::ResourceLink.where(from_type: "Decidim::Proposals::Proposal").pluck(:from_id) + + result = Decidim::Proposals::Proposal.where.not(state_published_at: nil).where(state: nil, id: proposals_after_copy) + + result.find_each do |proposal| + proposal.state_published_at = nil + proposal.save! + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 063926f..3f72352 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.define(version: 2021_02_17_172720) do +ActiveRecord::Schema.define(version: 2021_03_17_144414) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" From 7718219b5f12620892a63b94a4c9ce72e92204c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= Date: Wed, 17 Mar 2021 15:54:42 +0100 Subject: [PATCH 2/3] downgrade error gem --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e24762..6578135 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/Platoniq/decidim-module-decidim_awesome - revision: fe5b2a856054a1120e3fb6fc4be7783e7c726e10 + revision: b794496edc21041ed8a82750d0919e9706691a4f branch: feature/hashtags-map-search specs: decidim-decidim_awesome (0.6.6) @@ -386,7 +386,7 @@ GEM decidim-core (>= 0.21) declarative-builder (0.1.0) declarative-option (< 0.2.0) - declarative-option (0.1.1) + declarative-option (0.1.0) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) delayed_job_active_record (4.1.5) From 31f3d0410b895820409ec7e3a95860429a3d75d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= Date: Wed, 17 Mar 2021 16:03:27 +0100 Subject: [PATCH 3/3] rubocop --- ...idim_forms_questionnaires.decidim_forms.rb | 1 + ...lt_to_decidim_meetings.decidim_meetings.rb | 1 + ..._all_sessions_for_deleted_users.decidim.rb | 1 + ..._proposals_after_copy.decidim_proposals.rb | 1 + db/schema.rb | 159 +++++++++--------- 5 files changed, 84 insertions(+), 79 deletions(-) diff --git a/db/migrate/20210217172719_add_salt_to_decidim_forms_questionnaires.decidim_forms.rb b/db/migrate/20210217172719_add_salt_to_decidim_forms_questionnaires.decidim_forms.rb index 9af15d6..3fe82ac 100644 --- a/db/migrate/20210217172719_add_salt_to_decidim_forms_questionnaires.decidim_forms.rb +++ b/db/migrate/20210217172719_add_salt_to_decidim_forms_questionnaires.decidim_forms.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim_forms (originally 20201110152921) class AddSaltToDecidimFormsQuestionnaires < ActiveRecord::Migration[5.2] diff --git a/db/migrate/20210217172720_add_salt_to_decidim_meetings.decidim_meetings.rb b/db/migrate/20210217172720_add_salt_to_decidim_meetings.decidim_meetings.rb index d715040..a87ca15 100644 --- a/db/migrate/20210217172720_add_salt_to_decidim_meetings.decidim_meetings.rb +++ b/db/migrate/20210217172720_add_salt_to_decidim_meetings.decidim_meetings.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim_meetings (originally 20201111133246) class AddSaltToDecidimMeetings < ActiveRecord::Migration[5.2] diff --git a/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb b/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb index b4acff9..2b80cab 100644 --- a/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb +++ b/db/migrate/20210317144413_invalidate_all_sessions_for_deleted_users.decidim.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim (originally 20210302150803) class InvalidateAllSessionsForDeletedUsers < ActiveRecord::Migration[5.2] diff --git a/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb b/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb index 93105d8..d9300e0 100644 --- a/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb +++ b/db/migrate/20210317144414_fix_answered_proposals_after_copy.decidim_proposals.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # This migration comes from decidim_proposals (originally 20210127115628) class FixAnsweredProposalsAfterCopy < ActiveRecord::Migration[5.2] diff --git a/db/schema.rb b/db/schema.rb index 3f72352..23d9596 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # 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. @@ -10,8 +12,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_03_17_144414) do - +ActiveRecord::Schema.define(version: 20_210_317_144_414) do # These are extensions that must be enabled in order to support this database enable_extension "ltree" enable_extension "pg_trgm" @@ -84,8 +85,8 @@ t.index ["decidim_organization_id"], name: "index_action_logs_on_organization_id" t.index ["decidim_scope_id"], name: "index_decidim_action_logs_on_decidim_scope_id" t.index ["decidim_user_id"], name: "index_action_logs_on_user_id" - t.index ["participatory_space_type", "participatory_space_id"], name: "index_action_logs_on_space_type_and_id" - t.index ["resource_type", "resource_id"], name: "index_action_logs_on_resource_type_and_id" + t.index %w(participatory_space_type participatory_space_id), name: "index_action_logs_on_space_type_and_id" + t.index %w(resource_type resource_id), name: "index_action_logs_on_resource_type_and_id" t.index ["version_id"], name: "index_decidim_action_logs_on_version_id" t.index ["visibility"], name: "index_decidim_action_logs_on_visibility" end @@ -99,9 +100,9 @@ t.string "state" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_amendable_id", "decidim_amendable_type"], name: "index_on_amendable" + t.index %w(decidim_amendable_id decidim_amendable_type), name: "index_on_amendable" t.index ["decidim_emendation_id"], name: "index_decidim_amendments_on_decidim_emendation_id" - t.index ["decidim_user_id", "decidim_amendable_id", "decidim_amendable_type"], name: "index_on_amender_and_amendable" + t.index %w(decidim_user_id decidim_amendable_id decidim_amendable_type), name: "index_on_amender_and_amendable" t.index ["decidim_user_id"], name: "index_decidim_amendments_on_decidim_user_id" t.index ["state"], name: "index_decidim_amendments_on_state" end @@ -172,7 +173,7 @@ t.bigint "decidim_assemblies_type_id" t.index ["decidim_area_id"], name: "index_decidim_assemblies_on_decidim_area_id" t.index ["decidim_assemblies_type_id"], name: "index_decidim_assemblies_on_decidim_assemblies_type_id" - t.index ["decidim_organization_id", "slug"], name: "index_unique_assembly_slug_and_organization", unique: true + t.index %w(decidim_organization_id slug), name: "index_unique_assembly_slug_and_organization", unique: true t.index ["decidim_organization_id"], name: "index_decidim_assemblies_on_decidim_organization_id" t.index ["decidim_scope_id"], name: "index_decidim_assemblies_on_decidim_scope_id" t.index ["parent_id"], name: "decidim_assemblies_assemblies_on_parent_id" @@ -209,7 +210,7 @@ t.bigint "decidim_user_id" t.index ["decidim_assembly_id"], name: "index_decidim_assembly_members_on_decidim_assembly_id" t.index ["decidim_user_id"], name: "index_decidim_assembly_members_on_decidim_user_id" - t.index ["weight", "created_at"], name: "index_decidim_assembly_members_on_weight_and_created_at" + t.index %w(weight created_at), name: "index_decidim_assembly_members_on_weight_and_created_at" end create_table "decidim_assembly_user_roles", force: :cascade do |t| @@ -218,7 +219,7 @@ t.string "role" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_assembly_id", "decidim_user_id", "role"], name: "index_unique_user_and_assembly_role", unique: true + t.index %w(decidim_assembly_id decidim_user_id role), name: "index_unique_user_and_assembly_role", unique: true t.index ["decidim_user_id"], name: "index_decidim_assembly_user_roles_on_decidim_user_id" end @@ -228,7 +229,7 @@ t.integer "weight", default: 0, null: false t.string "collection_for_type", null: false t.bigint "collection_for_id", null: false - t.index ["collection_for_type", "collection_for_id"], name: "decidim_attachment_collections_collection_for_id_and_type" + t.index %w(collection_for_type collection_for_id), name: "decidim_attachment_collections_collection_for_id_and_type" end create_table "decidim_attachments", id: :serial, force: :cascade do |t| @@ -243,7 +244,7 @@ t.string "attached_to_type", null: false t.integer "weight", default: 0, null: false t.integer "attachment_collection_id" - t.index ["attached_to_id", "attached_to_type"], name: "index_decidim_attachments_on_attached_to" + t.index %w(attached_to_id attached_to_type), name: "index_decidim_attachments_on_attached_to" t.index ["attachment_collection_id"], name: "index_decidim_attachments_on_attachment_collection_id" end @@ -257,7 +258,7 @@ t.datetime "granted_at" t.jsonb "verification_metadata", default: {} t.string "verification_attachment" - t.index ["decidim_user_id", "name"], name: "index_decidim_authorizations_on_decidim_user_id_and_name", unique: true + t.index %w(decidim_user_id name), name: "index_decidim_authorizations_on_decidim_user_id_and_name", unique: true t.index ["decidim_user_id"], name: "index_decidim_authorizations_on_decidim_user_id" t.index ["unique_id"], name: "index_decidim_authorizations_on_unique_id" end @@ -269,7 +270,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_organization_id"], name: "index_decidim_awesome_on_decidim_organization_id" - t.index ["var", "decidim_organization_id"], name: "index_decidim_awesome_organization_var", unique: true + t.index %w(var decidim_organization_id), name: "index_decidim_awesome_organization_var", unique: true end create_table "decidim_awesome_config_constraints", force: :cascade do |t| @@ -278,7 +279,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_awesome_config_id"], name: "decidim_awesome_config_constraints_config" - t.index ["settings", "decidim_awesome_config_id"], name: "index_decidim_awesome_settings_awesome_config", unique: true + t.index %w(settings decidim_awesome_config_id), name: "index_decidim_awesome_settings_awesome_config", unique: true end create_table "decidim_awesome_editor_images", force: :cascade do |t| @@ -303,7 +304,7 @@ t.integer "decidim_user_group_id" t.integer "endorsements_count", default: 0, null: false t.integer "comments_count", default: 0, null: false - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_blogs_posts_on_decidim_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_blogs_posts_on_decidim_author" t.index ["decidim_component_id"], name: "index_decidim_blogs_posts_on_decidim_component_id" t.index ["decidim_user_group_id"], name: "index_decidim_blogs_posts_on_decidim_user_group_id" end @@ -324,7 +325,7 @@ create_table "decidim_budgets_line_items", id: :serial, force: :cascade do |t| t.integer "decidim_order_id" t.integer "decidim_project_id" - t.index ["decidim_order_id", "decidim_project_id"], name: "decidim_budgets_line_items_order_project_unique", unique: true + t.index %w(decidim_order_id decidim_project_id), name: "decidim_budgets_line_items_order_project_unique", unique: true t.index ["decidim_order_id"], name: "index_decidim_budgets_line_items_on_decidim_order_id" t.index ["decidim_project_id"], name: "index_decidim_budgets_line_items_on_decidim_project_id" end @@ -361,7 +362,7 @@ t.integer "decidim_participatory_space_id" t.string "decidim_participatory_space_type" t.integer "weight", default: 0, null: false - t.index ["decidim_participatory_space_id", "decidim_participatory_space_type"], name: "index_decidim_categories_on_decidim_participatory_space" + t.index %w(decidim_participatory_space_id decidim_participatory_space_type), name: "index_decidim_categories_on_decidim_participatory_space" t.index ["parent_id"], name: "index_decidim_categories_on_parent_id" end @@ -371,7 +372,7 @@ t.bigint "categorizable_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["categorizable_type", "categorizable_id"], name: "decidim_categorizations_categorizable_id_and_type" + t.index %w(categorizable_type categorizable_id), name: "decidim_categorizations_categorizable_id_and_type" t.index ["decidim_category_id"], name: "index_decidim_categorizations_on_decidim_category_id" end @@ -383,8 +384,8 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "decidim_author_type", null: false - t.index ["coauthorable_type", "coauthorable_id"], name: "index_coauthorable_on_coauthorship" - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_coauthorships_on_decidim_author" + t.index %w(coauthorable_type coauthorable_id), name: "index_coauthorable_on_coauthorship" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_coauthorships_on_decidim_author" t.index ["decidim_user_group_id"], name: "index_user_group_on_coauthorsihp" end @@ -395,9 +396,9 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "decidim_author_type", null: false - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_comments_comment_votes_on_decidim_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_comments_comment_votes_on_decidim_author" t.index ["decidim_author_id"], name: "decidim_comments_comment_vote_author" - t.index ["decidim_comment_id", "decidim_author_id"], name: "decidim_comments_comment_vote_comment_author_unique", unique: true + t.index %w(decidim_comment_id decidim_author_id), name: "decidim_comments_comment_vote_comment_author_unique", unique: true t.index ["decidim_comment_id"], name: "decidim_comments_comment_vote_comment" end @@ -416,10 +417,10 @@ t.jsonb "body" t.integer "comments_count", default: 0, null: false t.index ["created_at"], name: "index_decidim_comments_comments_on_created_at" - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_comments_comments_on_decidim_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_comments_comments_on_decidim_author" t.index ["decidim_author_id"], name: "decidim_comments_comment_author" - t.index ["decidim_commentable_type", "decidim_commentable_id"], name: "decidim_comments_comment_commentable" - t.index ["decidim_root_commentable_type", "decidim_root_commentable_id"], name: "decidim_comments_comment_root_commentable" + t.index %w(decidim_commentable_type decidim_commentable_id), name: "decidim_comments_comment_commentable" + t.index %w(decidim_root_commentable_type decidim_root_commentable_id), name: "decidim_comments_comment_root_commentable" t.index ["decidim_user_group_id"], name: "index_decidim_comments_comments_on_decidim_user_group_id" end @@ -434,7 +435,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "participatory_space_type", null: false - t.index ["participatory_space_id", "participatory_space_type"], name: "index_decidim_components_on_decidim_participatory_space" + t.index %w(participatory_space_id participatory_space_type), name: "index_decidim_components_on_decidim_participatory_space" end create_table "decidim_conference_speaker_conference_meetings", force: :cascade do |t| @@ -466,7 +467,7 @@ t.string "role" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_conference_id", "decidim_user_id", "role"], name: "index_unique_user_and_conference_role", unique: true + t.index %w(decidim_conference_id decidim_user_id role), name: "index_unique_user_and_conference_role", unique: true end create_table "decidim_conferences", force: :cascade do |t| @@ -499,7 +500,7 @@ t.string "main_logo" t.date "sign_date" t.datetime "diploma_sent_at" - t.index ["decidim_organization_id", "slug"], name: "index_unique_conference_slug_and_organization", unique: true + t.index %w(decidim_organization_id slug), name: "index_unique_conference_slug_and_organization", unique: true t.index ["decidim_organization_id"], name: "index_decidim_conferences_on_decidim_organization_id" t.index ["decidim_scope_id"], name: "index_decidim_conferences_on_decidim_scope_id" end @@ -534,7 +535,7 @@ t.datetime "confirmed_at" t.index ["decidim_conference_id"], name: "index_conferences_registrations_on_decidim_conference" t.index ["decidim_conference_registration_type_id"], name: "idx_conferences_registrations_on_registration_type_id" - t.index ["decidim_user_id", "decidim_conference_id"], name: "decidim_conferences_registrations_user_conference_unique", unique: true + t.index %w(decidim_user_id decidim_conference_id), name: "decidim_conferences_registrations_user_conference_unique", unique: true t.index ["decidim_user_id"], name: "index_decidim_conferences_registrations_on_decidim_user_id" end @@ -559,7 +560,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_conference_id"], name: "index_decidim_conferences_partners_on_decidim_conference_id" - t.index ["weight", "partner_type"], name: "index_decidim_conferences_partners_on_weight_and_partner_type" + t.index %w(weight partner_type), name: "index_decidim_conferences_partners_on_weight_and_partner_type" end create_table "decidim_conferences_registration_types", force: :cascade do |t| @@ -592,7 +593,7 @@ t.date "results_published_at" t.string "introductory_image" t.index ["decidim_highlighted_scope_id"], name: "index_decidim_consultations_on_decidim_highlighted_scope_id" - t.index ["decidim_organization_id", "slug"], name: "index_unique_consultation_slug_and_organization", unique: true + t.index %w(decidim_organization_id slug), name: "index_unique_consultation_slug_and_organization", unique: true t.index ["decidim_organization_id"], name: "index_decidim_consultations_on_decidim_organization_id" t.index ["description"], name: "decidim_consultations_description_search" t.index ["published_at"], name: "index_decidim_consultations_on_published_at" @@ -632,7 +633,7 @@ t.jsonb "instructions" t.integer "comments_count", default: 0, null: false t.index ["decidim_consultation_id"], name: "index_consultations_questions_on_consultation_id" - t.index ["decidim_organization_id", "slug"], name: "index_unique_question_slug_and_organization", unique: true + t.index %w(decidim_organization_id slug), name: "index_unique_question_slug_and_organization", unique: true t.index ["decidim_scope_id"], name: "index_decidim_consultations_questions_on_decidim_scope_id" t.index ["origin_scope"], name: "consultation_questions_origin_scope_search" t.index ["origin_title"], name: "consultation_questions_origin_title_search" @@ -667,7 +668,7 @@ t.integer "decidim_user_group_id" t.bigint "decidim_consultations_response_id" t.index ["decidim_author_id"], name: "index_consultations_votes_on_author" - t.index ["decidim_consultation_question_id", "decidim_author_id", "decidim_user_group_id"], name: "index_question_votes_author_unique", unique: true + t.index %w(decidim_consultation_question_id decidim_author_id decidim_user_group_id), name: "index_question_votes_author_unique", unique: true t.index ["decidim_consultation_question_id"], name: "index_consultations_votes_on_consultation_question" t.index ["decidim_consultations_response_id"], name: "index_consultations_votes_on_consultations_response_id" t.index ["decidim_user_group_id"], name: "index_decidim_consultations_votes_on_decidim_user_group_id" @@ -682,7 +683,7 @@ t.integer "weight" t.jsonb "images", default: {} t.integer "scoped_resource_id" - t.index ["decidim_organization_id", "scope_name", "scoped_resource_id", "manifest_name"], name: "idx_decidim_content_blocks_org_id_scope_scope_id_manifest" + t.index %w(decidim_organization_id scope_name scoped_resource_id manifest_name), name: "idx_decidim_content_blocks_org_id_scope_scope_id_manifest" t.index ["decidim_organization_id"], name: "index_decidim_content_blocks_on_decidim_organization_id" t.index ["manifest_name"], name: "index_decidim_content_blocks_on_manifest_name" t.index ["published_at"], name: "index_decidim_content_blocks_on_published_at" @@ -720,7 +721,7 @@ t.integer "last_comment_by_id" t.string "last_comment_by_type" t.index ["closed_at"], name: "index_decidim_debates_debates_on_closed_at" - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_debates_debates_on_decidim_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_debates_debates_on_decidim_author" t.index ["decidim_component_id"], name: "index_decidim_debates_debates_on_decidim_component_id" t.index ["decidim_user_group_id"], name: "index_decidim_debates_debates_on_decidim_user_group_id" t.index ["endorsements_count"], name: "idx_decidim_debates_debates_on_endorsemnts_count" @@ -734,10 +735,10 @@ t.integer "decidim_user_group_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_author_type", "decidim_author_id"], name: "idx_endorsements_authors" + t.index %w(decidim_author_type decidim_author_id), name: "idx_endorsements_authors" t.index ["decidim_user_group_id"], name: "index_decidim_endorsements_on_decidim_user_group_id" - t.index ["resource_type", "resource_id", "decidim_author_type", "decidim_author_id", "decidim_user_group_id"], name: "idx_endorsements_rsrcs_and_authors", unique: true - t.index ["resource_type", "resource_id"], name: "index_decidim_endorsements_on_resource_type_and_resource_id" + t.index %w(resource_type resource_id decidim_author_type decidim_author_id decidim_user_group_id), name: "idx_endorsements_rsrcs_and_authors", unique: true + t.index %w(resource_type resource_id), name: "index_decidim_endorsements_on_resource_type_and_resource_id" end create_table "decidim_follows", force: :cascade do |t| @@ -746,8 +747,8 @@ t.bigint "decidim_followable_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_followable_id", "decidim_followable_type"], name: "index_follows_followable_id_and_type" - t.index ["decidim_user_id", "decidim_followable_id", "decidim_followable_type"], name: "index_uniq_on_follows_user_and_followable", unique: true + t.index %w(decidim_followable_id decidim_followable_type), name: "index_follows_followable_id_and_type" + t.index %w(decidim_user_id decidim_followable_id decidim_followable_type), name: "index_uniq_on_follows_user_and_followable", unique: true t.index ["decidim_user_id"], name: "index_decidim_follows_on_decidim_user_id" end @@ -817,7 +818,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "salt" - t.index ["questionnaire_for_type", "questionnaire_for_id"], name: "index_decidim_forms_questionnaires_questionnaire_for" + t.index %w(questionnaire_for_type questionnaire_for_id), name: "index_decidim_forms_questionnaires_questionnaire_for" end create_table "decidim_forms_questions", id: :serial, force: :cascade do |t| @@ -859,7 +860,7 @@ t.integer "decidim_organization_id" t.index ["decidim_organization_id"], name: "index_decidim_identities_on_decidim_organization_id" t.index ["decidim_user_id"], name: "index_decidim_identities_on_decidim_user_id" - t.index ["provider", "uid", "decidim_organization_id"], name: "decidim_identities_provider_uid_organization_unique", unique: true + t.index %w(provider uid decidim_organization_id), name: "decidim_identities_provider_uid_organization_unique", unique: true end create_table "decidim_impersonation_logs", force: :cascade do |t| @@ -941,7 +942,7 @@ t.integer "decidim_user_group_id" t.integer "comments_count", default: 0, null: false t.string "salt" - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_meetings_meetings_on_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_meetings_meetings_on_author" t.index ["decidim_author_id"], name: "index_decidim_meetings_meetings_on_decidim_author_id" t.index ["decidim_component_id"], name: "index_decidim_meetings_meetings_on_decidim_component_id" t.index ["decidim_scope_id"], name: "index_decidim_meetings_meetings_on_decidim_scope_id" @@ -968,7 +969,7 @@ t.bigint "decidim_user_group_id" t.index ["decidim_meeting_id"], name: "index_decidim_meetings_registrations_on_decidim_meeting_id" t.index ["decidim_user_group_id"], name: "index_decidim_meetings_registrations_on_decidim_user_group_id" - t.index ["decidim_user_id", "decidim_meeting_id"], name: "decidim_meetings_registrations_user_meeting_unique", unique: true + t.index %w(decidim_user_id decidim_meeting_id), name: "decidim_meetings_registrations_user_meeting_unique", unique: true t.index ["decidim_user_id"], name: "index_decidim_meetings_registrations_on_decidim_user_id" end @@ -1026,13 +1027,13 @@ t.string "related_object_type" t.bigint "related_object_id" t.bigint "decidim_category_id" - t.index ["day", "metric_type", "decidim_organization_id", "participatory_space_type", "participatory_space_id", "related_object_type", "related_object_id", "decidim_category_id"], name: "idx_metric_by_day_type_org_space_object_category", unique: true + t.index %w(day metric_type decidim_organization_id participatory_space_type participatory_space_id related_object_type related_object_id decidim_category_id), name: "idx_metric_by_day_type_org_space_object_category", unique: true t.index ["day"], name: "index_decidim_metrics_on_day" t.index ["decidim_category_id"], name: "index_decidim_metrics_on_decidim_category_id" t.index ["decidim_organization_id"], name: "index_decidim_metrics_on_decidim_organization_id" t.index ["metric_type"], name: "index_decidim_metrics_on_metric_type" - t.index ["participatory_space_type", "participatory_space_id"], name: "index_metric_on_participatory_space_id_and_type" - t.index ["related_object_type", "related_object_id"], name: "index_metric_on_related_object_id_and_type" + t.index %w(participatory_space_type participatory_space_id), name: "index_metric_on_participatory_space_id_and_type" + t.index %w(related_object_type related_object_id), name: "index_metric_on_related_object_id_and_type" end create_table "decidim_moderations", id: :serial, force: :cascade do |t| @@ -1044,8 +1045,8 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "decidim_participatory_space_type", null: false - t.index ["decidim_participatory_space_id", "decidim_participatory_space_type"], name: "decidim_moderations_participatory_space" - t.index ["decidim_reportable_type", "decidim_reportable_id"], name: "decidim_moderations_reportable", unique: true + t.index %w(decidim_participatory_space_id decidim_participatory_space_type), name: "decidim_moderations_participatory_space" + t.index %w(decidim_reportable_type decidim_reportable_id), name: "decidim_moderations_reportable", unique: true t.index ["hidden_at"], name: "decidim_moderations_hidden_at" t.index ["report_count"], name: "decidim_moderations_report_count" end @@ -1232,8 +1233,8 @@ t.integer "position" t.jsonb "cta_text", default: {} t.string "cta_path" - t.index ["decidim_participatory_process_id", "active"], name: "unique_index_to_avoid_duplicate_active_steps", unique: true, where: "(active = true)" - t.index ["decidim_participatory_process_id", "position"], name: "index_unique_position_for_process", unique: true + t.index %w(decidim_participatory_process_id active), name: "unique_index_to_avoid_duplicate_active_steps", unique: true, where: "(active = true)" + t.index %w(decidim_participatory_process_id position), name: "index_unique_position_for_process", unique: true t.index ["decidim_participatory_process_id"], name: "index_decidim_processes_steps__on_decidim_process_id" t.index ["position"], name: "index_order_by_position_for_steps" end @@ -1244,7 +1245,7 @@ t.string "role" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_participatory_process_id", "decidim_user_id", "role"], name: "index_unique_user_and_process_role", unique: true + t.index %w(decidim_participatory_process_id decidim_user_id role), name: "index_unique_user_and_process_role", unique: true t.index ["decidim_user_id"], name: "idx_proces_user_role_on_user_id" end @@ -1281,7 +1282,7 @@ t.bigint "decidim_scope_type_id" t.boolean "show_metrics", default: true t.index ["decidim_area_id"], name: "index_decidim_participatory_processes_on_decidim_area_id" - t.index ["decidim_organization_id", "slug"], name: "index_unique_process_slug_and_organization", unique: true + t.index %w(decidim_organization_id slug), name: "index_unique_process_slug_and_organization", unique: true t.index ["decidim_organization_id"], name: "index_decidim_processes_on_decidim_organization_id" t.index ["decidim_participatory_process_group_id"], name: "idx_process_on_process_group_id" t.index ["decidim_scope_id"], name: "idx_process_on_scope_id" @@ -1295,9 +1296,9 @@ t.integer "to_id", null: false t.string "name", null: false t.jsonb "data" - t.index ["from_type", "from_id"], name: "index_participatory_space_links_on_from" + t.index %w(from_type from_id), name: "index_participatory_space_links_on_from" t.index ["name"], name: "index_participatory_space_links_name" - t.index ["to_type", "to_id"], name: "index_participatory_space_links_on_to" + t.index %w(to_type to_id), name: "index_participatory_space_links_on_to" end create_table "decidim_participatory_space_private_users", force: :cascade do |t| @@ -1307,7 +1308,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_user_id"], name: "index_decidim_spaces_users_on_private_user_id" - t.index ["privatable_to_type", "privatable_to_id"], name: "space_privatable_to_privatable_id" + t.index %w(privatable_to_type privatable_to_id), name: "space_privatable_to_privatable_id" end create_table "decidim_proposals_collaborative_draft_collaborator_requests", force: :cascade do |t| @@ -1372,7 +1373,7 @@ t.datetime "updated_at", null: false t.boolean "temporary", default: false, null: false t.index ["decidim_author_id"], name: "decidim_proposals_proposal_vote_author" - t.index ["decidim_proposal_id", "decidim_author_id"], name: "decidim_proposals_proposal_vote_proposal_author_unique", unique: true + t.index %w(decidim_proposal_id decidim_author_id), name: "decidim_proposals_proposal_vote_proposal_author_unique", unique: true t.index ["decidim_proposal_id"], name: "decidim_proposals_proposal_vote_proposal" end @@ -1419,7 +1420,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_proposal_id"], name: "decidim_proposals_valuation_assignment_proposal" - t.index ["valuator_role_type", "valuator_role_id"], name: "decidim_proposals_valuation_assignment_valuator_role" + t.index %w(valuator_role_type valuator_role_id), name: "decidim_proposals_valuation_assignment_valuator_role" end create_table "decidim_reports", id: :serial, force: :cascade do |t| @@ -1429,7 +1430,7 @@ t.text "details" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["decidim_moderation_id", "decidim_user_id"], name: "decidim_reports_moderation_user_unique", unique: true + t.index %w(decidim_moderation_id decidim_user_id), name: "decidim_reports_moderation_user_unique", unique: true t.index ["decidim_moderation_id"], name: "decidim_reports_moderation" t.index ["decidim_user_id"], name: "decidim_reports_user" end @@ -1441,9 +1442,9 @@ t.integer "to_id", null: false t.string "name", null: false t.jsonb "data" - t.index ["from_type", "from_id"], name: "index_decidim_resource_links_on_from_type_and_from_id" + t.index %w(from_type from_id), name: "index_decidim_resource_links_on_from_type_and_from_id" t.index ["name"], name: "index_decidim_resource_links_on_name" - t.index ["to_type", "to_id"], name: "index_decidim_resource_links_on_to_type_and_to_id" + t.index %w(to_type to_id), name: "index_decidim_resource_links_on_to_type_and_to_id" end create_table "decidim_resource_permissions", force: :cascade do |t| @@ -1452,7 +1453,7 @@ t.jsonb "permissions", default: {} t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["resource_type", "resource_id"], name: "index_decidim_resource_permissions_on_r_type_and_r_id", unique: true + t.index %w(resource_type resource_id), name: "index_decidim_resource_permissions_on_r_type_and_r_id", unique: true end create_table "decidim_scope_types", id: :serial, force: :cascade do |t| @@ -1471,7 +1472,7 @@ t.integer "parent_id" t.string "code", null: false t.integer "part_of", default: [], null: false, array: true - t.index ["decidim_organization_id", "code"], name: "index_decidim_scopes_on_decidim_organization_id_and_code", unique: true + t.index %w(decidim_organization_id code), name: "index_decidim_scopes_on_decidim_organization_id_and_code", unique: true t.index ["decidim_organization_id"], name: "index_decidim_scopes_on_decidim_organization_id" t.index ["parent_id"], name: "index_decidim_scopes_on_parent_id" t.index ["part_of"], name: "index_decidim_scopes_on_part_of", using: :gin @@ -1494,9 +1495,9 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_organization_id"], name: "index_decidim_searchable_resources_on_decidim_organization_id" - t.index ["decidim_participatory_space_type", "decidim_participatory_space_id"], name: "index_decidim_searchable_resource_on_pspace_type_and_pspace_id" + t.index %w(decidim_participatory_space_type decidim_participatory_space_id), name: "index_decidim_searchable_resource_on_pspace_type_and_pspace_id" t.index ["decidim_scope_id"], name: "index_decidim_searchable_resources_on_decidim_scope_id" - t.index ["resource_type", "resource_id"], name: "index_decidim_searchable_rsrcs_on_s_type_and_s_id" + t.index %w(resource_type resource_id), name: "index_decidim_searchable_rsrcs_on_s_type_and_s_id" end create_table "decidim_share_tokens", force: :cascade do |t| @@ -1511,7 +1512,7 @@ t.datetime "expires_at" t.index ["decidim_organization_id"], name: "index_decidim_share_tokens_on_decidim_organization_id" t.index ["decidim_user_id"], name: "index_decidim_share_tokens_on_decidim_user_id" - t.index ["token_for_type", "token_for_id"], name: "decidim_share_tokens_token_for" + t.index %w(token_for_type token_for_id), name: "decidim_share_tokens_token_for" end create_table "decidim_sortitions_sortitions", force: :cascade do |t| @@ -1535,7 +1536,7 @@ t.string "decidim_author_type", null: false t.integer "comments_count", default: 0, null: false t.index ["cancelled_by_user_id"], name: "index_decidim_sortitions_sortitions_on_cancelled_by_user_id" - t.index ["decidim_author_id", "decidim_author_type"], name: "index_decidim_sortitions_sortitions_on_decidim_author" + t.index %w(decidim_author_id decidim_author_type), name: "index_decidim_sortitions_sortitions_on_decidim_author" t.index ["decidim_author_id"], name: "index_decidim_sortitions_sortitions_on_decidim_author_id" t.index ["decidim_component_id"], name: "index_sortitions__on_feature" t.index ["decidim_proposals_component_id"], name: "index_sortitions__on_proposals_feature" @@ -1595,7 +1596,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["decidim_organization_id"], name: "index_decidim_templates_organization" - t.index ["templatable_type", "templatable_id"], name: "index_decidim_templates_templatable" + t.index %w(templatable_type templatable_id), name: "index_decidim_templates_templatable" end create_table "decidim_term_customizer_constraints", force: :cascade do |t| @@ -1604,7 +1605,7 @@ t.bigint "subject_id" t.bigint "translation_set_id", null: false t.index ["decidim_organization_id"], name: "decidim_term_customizer_constraint_organization" - t.index ["subject_type", "subject_id"], name: "decidim_term_customizer_constraint_subject" + t.index %w(subject_type subject_id), name: "decidim_term_customizer_constraint_subject" t.index ["translation_set_id"], name: "decidim_term_customizer_constraint_translation_set" end @@ -1626,11 +1627,11 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "role", default: "requested", null: false - t.index ["decidim_user_group_id", "decidim_user_id"], name: "index_user_group_memberships_group_id_user_id" + t.index %w(decidim_user_group_id decidim_user_id), name: "index_user_group_memberships_group_id_user_id" t.index ["decidim_user_group_id"], name: "index_decidim_user_group_memberships_on_decidim_user_group_id" - t.index ["decidim_user_id", "decidim_user_group_id"], name: "decidim_user_group_memberships_unique_user_and_group_ids", unique: true + t.index %w(decidim_user_id decidim_user_group_id), name: "decidim_user_group_memberships_unique_user_and_group_ids", unique: true t.index ["decidim_user_id"], name: "index_decidim_user_group_memberships_on_decidim_user_id" - t.index ["role", "decidim_user_group_id"], name: "decidim_group_membership_one_creator_per_group", unique: true, where: "((role)::text = 'creator'::text)" + t.index %w(role decidim_user_group_id), name: "decidim_group_membership_one_creator_per_group", unique: true, where: "((role)::text = 'creator'::text)" end create_table "decidim_users", id: :serial, force: :cascade do |t| @@ -1689,13 +1690,13 @@ t.string "direct_message_types", default: "all", null: false t.index ["confirmation_token"], name: "index_decidim_users_on_confirmation_token", unique: true t.index ["decidim_organization_id"], name: "index_decidim_users_on_decidim_organization_id" - t.index ["email", "decidim_organization_id"], name: "index_decidim_users_on_email_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false) AND ((type)::text = 'Decidim::User'::text))" - t.index ["id", "type"], name: "index_decidim_users_on_id_and_type" + t.index %w(email decidim_organization_id), name: "index_decidim_users_on_email_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false) AND ((type)::text = 'Decidim::User'::text))" + t.index %w(id type), name: "index_decidim_users_on_id_and_type" t.index ["invitation_token"], name: "index_decidim_users_on_invitation_token", unique: true t.index ["invitations_count"], name: "index_decidim_users_on_invitations_count" - t.index ["invited_by_id", "invited_by_type"], name: "index_decidim_users_on_invited_by_id_and_invited_by_type" + t.index %w(invited_by_id invited_by_type), name: "index_decidim_users_on_invited_by_id_and_invited_by_type" t.index ["invited_by_id"], name: "index_decidim_users_on_invited_by_id" - t.index ["nickname", "decidim_organization_id"], name: "index_decidim_users_on_nickame_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false))" + t.index %w(nickname decidim_organization_id), name: "index_decidim_users_on_nickame_and_decidim_organization_id", unique: true, where: "((deleted_at IS NULL) AND (managed = false))" t.index ["officialized_at"], name: "index_decidim_users_on_officialized_at" t.index ["reset_password_token"], name: "index_decidim_users_on_reset_password_token", unique: true t.index ["unlock_token"], name: "index_decidim_users_on_unlock_token", unique: true @@ -1721,7 +1722,7 @@ t.string "queue" t.datetime "created_at" t.datetime "updated_at" - t.index ["priority", "run_at"], name: "delayed_jobs_priority" + t.index %w(priority run_at), name: "delayed_jobs_priority" end create_table "oauth_access_grants", force: :cascade do |t| @@ -1780,8 +1781,8 @@ t.jsonb "object" t.datetime "created_at" t.text "object_changes" - t.index ["item_id", "item_type"], name: "index_versions_on_item_id_and_item_type" - t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id" + t.index %w(item_id item_type), name: "index_versions_on_item_id_and_item_type" + t.index %w(item_type item_id), name: "index_versions_on_item_type_and_item_id" end add_foreign_key "decidim_area_types", "decidim_organizations"