Fix new rubocop warnings

This commit is contained in:
Tom Hughes 2020-09-07 07:11:22 +01:00
parent feb1412109
commit 18b9b9f14c
4 changed files with 10 additions and 10 deletions

View file

@ -24,7 +24,7 @@ class UserEnhancements < ActiveRecord::Migration[4.2]
add_index "user_tokens", ["token"], :name => "user_tokens_token_idx", :unique => true
add_index "user_tokens", ["user_id"], :name => "user_tokens_user_id_idx"
User.where("token is not null").each do |user|
User.where.not(:token => nil).each do |user|
UserToken.create(:user_id => user.id, :token => user.token, :expiry => 1.week.from_now)
end

View file

@ -11,7 +11,7 @@ class TileNodes < ActiveRecord::Migration[4.2]
def self.upgrade_table(from_table, to_table, model)
if ENV["USE_DB_FUNCTIONS"]
execute <<-SQL
execute <<-SQL.squish
INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
user_id, visible, tags, timestamp,
@ -20,7 +20,7 @@ class TileNodes < ActiveRecord::Migration[4.2]
FROM #{from_table}
SQL
else
execute <<-SQL
execute <<-SQL.squish
INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
user_id, visible, tags, timestamp, 0
@ -32,7 +32,7 @@ class TileNodes < ActiveRecord::Migration[4.2]
end
def self.downgrade_table(from_table, to_table)
execute <<-SQL
execute <<-SQL.squish
INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp)
SELECT id, latitude / 10000000, longitude / 10000000,
user_id, visible, tags, timestamp