Fix Rails/SquishedSQLHeredocs cop (#24694)
parent
8dcfb6e0ea
commit
60ac9e8634
|
@ -1520,15 +1520,6 @@ Rails/SkipsModelValidations:
|
||||||
- 'spec/services/follow_service_spec.rb'
|
- 'spec/services/follow_service_spec.rb'
|
||||||
- 'spec/services/update_account_service_spec.rb'
|
- 'spec/services/update_account_service_spec.rb'
|
||||||
|
|
||||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
|
||||||
Rails/SquishedSQLHeredocs:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20170920024819_status_ids_to_timestamp_ids.rb'
|
|
||||||
- 'db/migrate/20180608213548_reject_following_blocked_users.rb'
|
|
||||||
- 'db/post_migrate/20190519130537_remove_boosts_widening_audience.rb'
|
|
||||||
- 'lib/mastodon/snowflake.rb'
|
|
||||||
- 'lib/tasks/tests.rake'
|
|
||||||
|
|
||||||
Rails/TransactionExitStatement:
|
Rails/TransactionExitStatement:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'app/lib/activitypub/activity/announce.rb'
|
- 'app/lib/activitypub/activity/announce.rb'
|
||||||
|
|
|
@ -4,7 +4,7 @@ class StatusIdsToTimestampIds < ActiveRecord::Migration[5.1]
|
||||||
Mastodon::Snowflake.define_timestamp_id
|
Mastodon::Snowflake.define_timestamp_id
|
||||||
|
|
||||||
# Set up the statuses.id column to use our timestamp-based IDs.
|
# Set up the statuses.id column to use our timestamp-based IDs.
|
||||||
ActiveRecord::Base.connection.execute(<<~SQL)
|
ActiveRecord::Base.connection.execute(<<~SQL.squish)
|
||||||
ALTER TABLE statuses
|
ALTER TABLE statuses
|
||||||
ALTER COLUMN id
|
ALTER COLUMN id
|
||||||
SET DEFAULT timestamp_id('statuses')
|
SET DEFAULT timestamp_id('statuses')
|
||||||
|
@ -21,7 +21,7 @@ class StatusIdsToTimestampIds < ActiveRecord::Migration[5.1]
|
||||||
|
|
||||||
# We lock the table during this so that the ID won't get clobbered,
|
# We lock the table during this so that the ID won't get clobbered,
|
||||||
# but ID is indexed, so this should be a fast operation.
|
# but ID is indexed, so this should be a fast operation.
|
||||||
ActiveRecord::Base.connection.execute(<<~SQL)
|
ActiveRecord::Base.connection.execute(<<~SQL.squish)
|
||||||
LOCK statuses;
|
LOCK statuses;
|
||||||
SELECT setval('statuses_id_seq', (SELECT MAX(id) FROM statuses));
|
SELECT setval('statuses_id_seq', (SELECT MAX(id) FROM statuses));
|
||||||
ALTER TABLE statuses
|
ALTER TABLE statuses
|
||||||
|
|
|
@ -2,14 +2,14 @@ class RejectFollowingBlockedUsers < ActiveRecord::Migration[5.2]
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
def up
|
def up
|
||||||
blocked_follows = Follow.find_by_sql(<<-SQL)
|
blocked_follows = Follow.find_by_sql(<<-SQL.squish)
|
||||||
select f.* from follows f
|
select f.* from follows f
|
||||||
inner join blocks b on
|
inner join blocks b on
|
||||||
f.account_id = b.target_account_id and
|
f.account_id = b.target_account_id and
|
||||||
f.target_account_id = b.account_id
|
f.target_account_id = b.account_id
|
||||||
SQL
|
SQL
|
||||||
|
|
||||||
domain_blocked_follows = Follow.find_by_sql(<<-SQL)
|
domain_blocked_follows = Follow.find_by_sql(<<-SQL.squish)
|
||||||
select f.* from follows f
|
select f.* from follows f
|
||||||
inner join accounts following on f.account_id = following.id
|
inner join accounts following on f.account_id = following.id
|
||||||
inner join account_domain_blocks b on
|
inner join account_domain_blocks b on
|
||||||
|
|
|
@ -2,7 +2,7 @@ class RemoveBoostsWideningAudience < ActiveRecord::Migration[5.2]
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
def up
|
def up
|
||||||
public_boosts = Status.find_by_sql(<<-SQL)
|
public_boosts = Status.find_by_sql(<<-SQL.squish)
|
||||||
SELECT boost.id
|
SELECT boost.id
|
||||||
FROM statuses AS boost
|
FROM statuses AS boost
|
||||||
LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
|
LEFT JOIN statuses AS boosted ON boost.reblog_of_id = boosted.id
|
||||||
|
|
|
@ -146,7 +146,7 @@ module Mastodon::Snowflake
|
||||||
private
|
private
|
||||||
|
|
||||||
def already_defined?
|
def already_defined?
|
||||||
connection.execute(<<~SQL).values.first.first
|
connection.execute(<<~SQL.squish).values.first.first
|
||||||
SELECT EXISTS(
|
SELECT EXISTS(
|
||||||
SELECT * FROM pg_proc WHERE proname = 'timestamp_id'
|
SELECT * FROM pg_proc WHERE proname = 'timestamp_id'
|
||||||
);
|
);
|
||||||
|
|
|
@ -113,7 +113,7 @@ namespace :tests do
|
||||||
|
|
||||||
desc 'Populate the database with test data for 2.4.0'
|
desc 'Populate the database with test data for 2.4.0'
|
||||||
task populate_v2_4: :environment do # rubocop:disable Naming/VariableNumber
|
task populate_v2_4: :environment do # rubocop:disable Naming/VariableNumber
|
||||||
ActiveRecord::Base.connection.execute(<<~SQL)
|
ActiveRecord::Base.connection.execute(<<~SQL.squish)
|
||||||
INSERT INTO "settings"
|
INSERT INTO "settings"
|
||||||
(id, thing_type, thing_id, var, value, created_at, updated_at)
|
(id, thing_type, thing_id, var, value, created_at, updated_at)
|
||||||
VALUES
|
VALUES
|
||||||
|
|
Reference in New Issue