summaryrefslogtreecommitdiffstats
path: root/db
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-01-30 21:38:54 +0100
committerGitHub <noreply@github.com>2022-01-30 21:38:54 +0100
commitac583fce215ff5951b06d3a3da6df397c300df40 (patch)
treeeb24e54035743f1d88623ed6986cf3d928855201 /db
parentf5639e1cbe0eb9de88a8f4b1c82833fdcffe62b8 (diff)
Fix some old migration scripts (#17394)
* Fix some old migration scripts * Fix edge case in two-step migration from older releases
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb40
-rw-r--r--db/migrate/20190715164535_add_instance_actor.rb5
-rw-r--r--db/migrate/20191007013357_update_pt_locales.rb4
-rw-r--r--db/views/follow_recommendations_v01.sql4
-rw-r--r--db/views/follow_recommendations_v02.sql4
5 files changed, 53 insertions, 4 deletions
diff --git a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
index bd4f4c2a368..40537e9c9e0 100644
--- a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
+++ b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
@@ -1,6 +1,46 @@
class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
+ class StreamEntry < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :stream_entries
+ end
+
+ class Status < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :statuses
+ has_many :favourites, inverse_of: :status, dependent: :destroy
+ has_many :mentions, dependent: :destroy, inverse_of: :status
+ end
+
+ class Favourite < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :favourites
+ belongs_to :status, inverse_of: :favourites
+ end
+
+ class Mention < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :mentions
+ belongs_to :status
+ end
+
+ class Notification < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, optional: true
+ belongs_to :from_account, class_name: 'Account', optional: true
+ belongs_to :activity, polymorphic: true, optional: true
+ end
+
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ has_many :stream_entries, inverse_of: :account, dependent: :destroy
+ has_many :statuses, inverse_of: :account, dependent: :destroy
+ has_many :favourites, inverse_of: :account, dependent: :destroy
+ has_many :mentions, inverse_of: :account, dependent: :destroy
+ has_many :notifications, inverse_of: :account, dependent: :destroy
+ end
+
def up
local_domain = Rails.configuration.x.local_domain
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index a26d5494932..8c0301d69d8 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -1,4 +1,9 @@
class AddInstanceActor < ActiveRecord::Migration[5.2]
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ validates :username, uniqueness: { scope: :domain, case_sensitive: false }
+ end
+
def up
Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
end
diff --git a/db/migrate/20191007013357_update_pt_locales.rb b/db/migrate/20191007013357_update_pt_locales.rb
index b7288d38a0d..9e8f8b42416 100644
--- a/db/migrate/20191007013357_update_pt_locales.rb
+++ b/db/migrate/20191007013357_update_pt_locales.rb
@@ -1,4 +1,8 @@
class UpdatePtLocales < ActiveRecord::Migration[5.2]
+ class User < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ end
+
disable_ddl_transaction!
def up
diff --git a/db/views/follow_recommendations_v01.sql b/db/views/follow_recommendations_v01.sql
index 799abeaee59..8295bbc0f0a 100644
--- a/db/views/follow_recommendations_v01.sql
+++ b/db/views/follow_recommendations_v01.sql
@@ -20,7 +20,7 @@ FROM (
HAVING count(follows.id) >= 5
UNION ALL
SELECT accounts.id AS account_id,
- sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+ sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
'most_interactions' AS reason
FROM status_stats
INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -32,7 +32,7 @@ FROM (
AND accounts.locked = 'f'
AND accounts.discoverable = 't'
GROUP BY accounts.id
- HAVING sum(reblogs_count + favourites_count) >= 5
+ HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
) t0
GROUP BY account_id
ORDER BY rank DESC
diff --git a/db/views/follow_recommendations_v02.sql b/db/views/follow_recommendations_v02.sql
index 673c5cc85db..f67c6eecf1f 100644
--- a/db/views/follow_recommendations_v02.sql
+++ b/db/views/follow_recommendations_v02.sql
@@ -18,7 +18,7 @@ FROM (
HAVING count(follows.id) >= 5
UNION ALL
SELECT account_summaries.account_id AS account_id,
- sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+ sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
'most_interactions' AS reason
FROM status_stats
INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -28,7 +28,7 @@ FROM (
AND account_summaries.sensitive = 'f'
AND follow_recommendation_suppressions.id IS NULL
GROUP BY account_summaries.account_id
- HAVING sum(reblogs_count + favourites_count) >= 5
+ HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
) t0
GROUP BY account_id
ORDER BY rank DESC