Drop references to OAuth 1 tables

diff --git a/cookbooks/db/files/default/monthly-reindex.sql b/cookbooks/db/files/default/monthly-reindex.sql
index 65412d414e3fccd8efa8126b2e7347bebb8fa77b..8a0d1ecbce7203558b4150bf1aaa75f358251e97 100644 (file)
--- a/cookbooks/db/files/default/monthly-reindex.sql
+++ b/cookbooks/db/files/default/monthly-reindex.sql
@@ -7,7 +7,6 @@ REINDEX (VERBOSE) TABLE CONCURRENTLY changeset_comments;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changeset_tags;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changesets;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changesets_subscribers;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changeset_tags;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changesets;
 REINDEX (VERBOSE) TABLE CONCURRENTLY changesets_subscribers;

-REINDEX (VERBOSE) TABLE CONCURRENTLY client_applications;

 REINDEX (VERBOSE) TABLE CONCURRENTLY current_relation_members;
 REINDEX (VERBOSE) TABLE CONCURRENTLY delayed_jobs;
 REINDEX (VERBOSE) TABLE CONCURRENTLY diary_comments;
 REINDEX (VERBOSE) TABLE CONCURRENTLY current_relation_members;
 REINDEX (VERBOSE) TABLE CONCURRENTLY delayed_jobs;
 REINDEX (VERBOSE) TABLE CONCURRENTLY diary_comments;


@@ -25,8 +24,6 @@ REINDEX (VERBOSE) TABLE CONCURRENTLY notes;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_access_grants;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_access_tokens;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_applications;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_access_grants;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_access_tokens;
 REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_applications;

-REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_nonces;
-REINDEX (VERBOSE) TABLE CONCURRENTLY oauth_tokens;

 REINDEX (VERBOSE) TABLE CONCURRENTLY redactions;
 REINDEX (VERBOSE) TABLE CONCURRENTLY reports;
 REINDEX (VERBOSE) TABLE CONCURRENTLY schema_migrations;
 REINDEX (VERBOSE) TABLE CONCURRENTLY redactions;
 REINDEX (VERBOSE) TABLE CONCURRENTLY reports;
 REINDEX (VERBOSE) TABLE CONCURRENTLY schema_migrations;

diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb
index c2d1da0247dbe65bf12fe79276530a9cd756cc04..606e902bff69be86dc635c4fc1814021a125fd9b 100644 (file)
--- a/cookbooks/db/recipes/master.rb
+++ b/cookbooks/db/recipes/master.rb
@@ -83,7 +83,6 @@ CGIMAP_PERMISSIONS = {
   "changeset_comments" => [:select],
   "changeset_tags" => [:select],
   "changesets" => [:select, :update],
   "changeset_comments" => [:select],
   "changeset_tags" => [:select],
   "changesets" => [:select, :update],

-  "client_applications" => [:select],

   "current_node_tags" => [:select, :insert, :delete],
   "current_nodes" => [:select, :insert, :update],
   "current_nodes_id_seq" => [:update],
   "current_node_tags" => [:select, :insert, :delete],
   "current_nodes" => [:select, :insert, :update],
   "current_nodes_id_seq" => [:update],


@@ -101,9 +100,6 @@ CGIMAP_PERMISSIONS = {
   "oauth_access_grants" => [:select],
   "oauth_access_tokens" => [:select],
   "oauth_applications" => [:select],
   "oauth_access_grants" => [:select],
   "oauth_access_tokens" => [:select],
   "oauth_applications" => [:select],

-  "oauth_nonces" => [:select, :insert],
-  "oauth_nonces_id_seq" => [:update],
-  "oauth_tokens" => [:select],

   "relation_members" => [:select, :insert],
   "relation_tags" => [:select, :insert],
   "relations" => [:select, :insert],
   "relation_members" => [:select, :insert],
   "relation_tags" => [:select, :insert],
   "relations" => [:select, :insert],


@@ -151,7 +147,6 @@ PROMETHEUS_PERMISSIONS = {
   changeset_tags
   changesets
   changesets_subscribers
   changeset_tags
   changesets
   changesets_subscribers

-  client_applications

   current_node_tags
   current_nodes
   current_relation_members
   current_node_tags
   current_nodes
   current_relation_members


@@ -179,9 +174,7 @@ PROMETHEUS_PERMISSIONS = {
   oauth_access_grants
   oauth_access_tokens
   oauth_applications
   oauth_access_grants
   oauth_access_tokens
   oauth_applications

-  oauth_nonces

   oauth_openid_requests
   oauth_openid_requests

-  oauth_tokens

   redactions
   relation_members
   relation_tags
   redactions
   relation_members
   relation_tags


@@ -218,7 +211,6 @@ end
   active_storage_variant_records_id_seq
   changeset_comments_id_seq
   changesets_id_seq
   active_storage_variant_records_id_seq
   changeset_comments_id_seq
   changesets_id_seq

-  client_applications_id_seq

   current_nodes_id_seq
   current_relations_id_seq
   current_ways_id_seq
   current_nodes_id_seq
   current_relations_id_seq
   current_ways_id_seq


@@ -236,9 +228,7 @@ end
   oauth_access_grants_id_seq
   oauth_access_tokens_id_seq
   oauth_applications_id_seq
   oauth_access_grants_id_seq
   oauth_access_tokens_id_seq
   oauth_applications_id_seq

-  oauth_nonces_id_seq

   oauth_openid_requests_id_seq
   oauth_openid_requests_id_seq

-  oauth_tokens_id_seq

   redactions_id_seq
   reports_id_seq
   user_blocks_id_seq
   redactions_id_seq
   reports_id_seq
   user_blocks_id_seq