Remove empty strings (#5732)

This commit is contained in:
ysksn 2017-11-17 10:52:30 +09:00 committed by Yamagishi Kazutoshi
parent 3e90987c8b
commit 9dd5e329ab
13 changed files with 48 additions and 48 deletions

View file

@ -3,6 +3,6 @@
= simple_form_for @application, url: settings_applications_path do |f| = simple_form_for @application, url: settings_applications_path do |f|
= render 'fields', f: f = render 'fields', f: f
.actions .actions
= f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit = f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit

View file

@ -25,7 +25,7 @@
= simple_form_for @application, url: settings_application_path(@application), method: :put do |f| = simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
= render 'fields', f: f = render 'fields', f: f
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

View file

@ -84,7 +84,7 @@ module Mastodon
BACKGROUND_MIGRATION_BATCH_SIZE = 1000 # Number of rows to process per job BACKGROUND_MIGRATION_BATCH_SIZE = 1000 # Number of rows to process per job
BACKGROUND_MIGRATION_JOB_BUFFER_SIZE = 1000 # Number of jobs to bulk queue at a time BACKGROUND_MIGRATION_JOB_BUFFER_SIZE = 1000 # Number of jobs to bulk queue at a time
# Gets an estimated number of rows for a table # Gets an estimated number of rows for a table
def estimate_rows_in_table(table_name) def estimate_rows_in_table(table_name)
exec_query('SELECT reltuples FROM pg_class WHERE relname = ' + exec_query('SELECT reltuples FROM pg_class WHERE relname = ' +
@ -313,14 +313,14 @@ module Mastodon
end end
table = Arel::Table.new(table_name) table = Arel::Table.new(table_name)
total = estimate_rows_in_table(table_name).to_i total = estimate_rows_in_table(table_name).to_i
if total == 0 if total == 0
count_arel = table.project(Arel.star.count.as('count')) count_arel = table.project(Arel.star.count.as('count'))
count_arel = yield table, count_arel if block_given? count_arel = yield table, count_arel if block_given?
total = exec_query(count_arel.to_sql).to_hash.first['count'].to_i total = exec_query(count_arel.to_sql).to_hash.first['count'].to_i
return if total == 0 return if total == 0
end end
@ -339,7 +339,7 @@ module Mastodon
# In case there are no rows but we didn't catch it in the estimated size: # In case there are no rows but we didn't catch it in the estimated size:
return unless first_row return unless first_row
start_id = first_row['id'].to_i start_id = first_row['id'].to_i
say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)" say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)"
started_time = Time.now started_time = Time.now
@ -347,7 +347,7 @@ module Mastodon
migrated = 0 migrated = 0
loop do loop do
stop_row = nil stop_row = nil
suppress_messages do suppress_messages do
stop_arel = table.project(table[:id]) stop_arel = table.project(table[:id])
.where(table[:id].gteq(start_id)) .where(table[:id].gteq(start_id))
@ -373,29 +373,29 @@ module Mastodon
execute(update_arel.to_sql) execute(update_arel.to_sql)
end end
migrated += batch_size migrated += batch_size
if Time.now - last_time > 1 if Time.now - last_time > 1
status = "Migrated #{migrated} rows" status = "Migrated #{migrated} rows"
percentage = 100.0 * migrated / total percentage = 100.0 * migrated / total
status += " (~#{sprintf('%.2f', percentage)}%, " status += " (~#{sprintf('%.2f', percentage)}%, "
remaining_time = (100.0 - percentage) * (Time.now - started_time) / percentage remaining_time = (100.0 - percentage) * (Time.now - started_time) / percentage
status += "#{(remaining_time / 60).to_i}:" status += "#{(remaining_time / 60).to_i}:"
status += sprintf('%02d', remaining_time.to_i % 60) status += sprintf('%02d', remaining_time.to_i % 60)
status += ' remaining, ' status += ' remaining, '
# Tell users not to interrupt if we're almost done. # Tell users not to interrupt if we're almost done.
if remaining_time > 10 if remaining_time > 10
status += 'safe to interrupt' status += 'safe to interrupt'
else else
status += 'DO NOT interrupt' status += 'DO NOT interrupt'
end end
status += ')' status += ')'
say status, true say status, true
last_time = Time.now last_time = Time.now
end end
@ -483,7 +483,7 @@ module Mastodon
check_trigger_permissions!(table) check_trigger_permissions!(table)
trigger_name = rename_trigger_name(table, old, new) trigger_name = rename_trigger_name(table, old, new)
# If we were in the middle of update_column_in_batches, we should remove # If we were in the middle of update_column_in_batches, we should remove
# the old column and start over, as we have no idea where we were. # the old column and start over, as we have no idea where we were.
if column_for(table, new) if column_for(table, new)
@ -492,7 +492,7 @@ module Mastodon
else else
remove_rename_triggers_for_mysql(trigger_name) remove_rename_triggers_for_mysql(trigger_name)
end end
remove_column(table, new) remove_column(table, new)
end end
@ -546,12 +546,12 @@ module Mastodon
temp_column = rename_column_name(column) temp_column = rename_column_name(column)
rename_column_concurrently(table, column, temp_column, type: new_type) rename_column_concurrently(table, column, temp_column, type: new_type)
# Primary keys don't necessarily have an associated index. # Primary keys don't necessarily have an associated index.
if ActiveRecord::Base.get_primary_key(table) == column.to_s if ActiveRecord::Base.get_primary_key(table) == column.to_s
old_pk_index_name = "index_#{table}_on_#{column}" old_pk_index_name = "index_#{table}_on_#{column}"
new_pk_index_name = "index_#{table}_on_#{column}_cm" new_pk_index_name = "index_#{table}_on_#{column}_cm"
unless indexes_for(table, column).find{|i| i.name == old_pk_index_name} unless indexes_for(table, column).find{|i| i.name == old_pk_index_name}
add_concurrent_index(table, [temp_column], { add_concurrent_index(table, [temp_column], {
unique: true, unique: true,
@ -572,14 +572,14 @@ module Mastodon
# Wait for the indices to be built # Wait for the indices to be built
indexes_for(table, column).each do |index| indexes_for(table, column).each do |index|
expected_name = index.name + '_cm' expected_name = index.name + '_cm'
puts "Waiting for index #{expected_name}" puts "Waiting for index #{expected_name}"
sleep 1 until indexes_for(table, temp_column).find {|i| i.name == expected_name } sleep 1 until indexes_for(table, temp_column).find {|i| i.name == expected_name }
end end
was_primary = (ActiveRecord::Base.get_primary_key(table) == column.to_s) was_primary = (ActiveRecord::Base.get_primary_key(table) == column.to_s)
old_default_fn = column_for(table, column).default_function old_default_fn = column_for(table, column).default_function
old_fks = [] old_fks = []
if was_primary if was_primary
# Get any foreign keys pointing at this column we need to recreate, and # Get any foreign keys pointing at this column we need to recreate, and
@ -613,7 +613,7 @@ module Mastodon
target_col: temp_column, target_col: temp_column,
on_delete: extract_foreign_key_action(old_fk['on_delete']) on_delete: extract_foreign_key_action(old_fk['on_delete'])
) )
remove_foreign_key(old_fk['src_table'], name: old_fk['name']) remove_foreign_key(old_fk['src_table'], name: old_fk['name'])
end end
end end
@ -629,15 +629,15 @@ module Mastodon
transaction do transaction do
# This has to be performed in a transaction as otherwise we might have # This has to be performed in a transaction as otherwise we might have
# inconsistent data. # inconsistent data.
cleanup_concurrent_column_rename(table, column, temp_column) cleanup_concurrent_column_rename(table, column, temp_column)
rename_column(table, temp_column, column) rename_column(table, temp_column, column)
# If there was an old default function, we didn't copy it. Do that now # If there was an old default function, we didn't copy it. Do that now
# in the transaction, so we don't miss anything. # in the transaction, so we don't miss anything.
change_column_default(table, column, -> { old_default_fn }) if old_default_fn change_column_default(table, column, -> { old_default_fn }) if old_default_fn
end end
# Rename any indices back to what they should be. # Rename any indices back to what they should be.
indexes_for(table, column).each do |index| indexes_for(table, column).each do |index|
next unless index.name.end_with?('_cm') next unless index.name.end_with?('_cm')
@ -645,7 +645,7 @@ module Mastodon
real_index_name = index.name.sub(/_cm$/, '') real_index_name = index.name.sub(/_cm$/, '')
rename_index(table, index.name, real_index_name) rename_index(table, index.name, real_index_name)
end end
# Rename any foreign keys back to names based on the real column. # Rename any foreign keys back to names based on the real column.
foreign_keys_for(table, column).each do |fk| foreign_keys_for(table, column).each do |fk|
old_fk_name = concurrent_foreign_key_name(fk.from_table, temp_column, 'id') old_fk_name = concurrent_foreign_key_name(fk.from_table, temp_column, 'id')
@ -653,7 +653,7 @@ module Mastodon
execute("ALTER TABLE #{fk.from_table} RENAME CONSTRAINT " + execute("ALTER TABLE #{fk.from_table} RENAME CONSTRAINT " +
"#{old_fk_name} TO #{new_fk_name}") "#{old_fk_name} TO #{new_fk_name}")
end end
# Rename any foreign keys from other tables to names based on the real # Rename any foreign keys from other tables to names based on the real
# column. # column.
old_fks.each do |old_fk| old_fks.each do |old_fk|
@ -664,7 +664,7 @@ module Mastodon
execute("ALTER TABLE #{old_fk['src_table']} RENAME CONSTRAINT " + execute("ALTER TABLE #{old_fk['src_table']} RENAME CONSTRAINT " +
"#{old_fk_name} TO #{new_fk_name}") "#{old_fk_name} TO #{new_fk_name}")
end end
# If the old column was a primary key, mark the new one as a primary key. # If the old column was a primary key, mark the new one as a primary key.
if was_primary if was_primary
execute("ALTER TABLE #{table} ADD PRIMARY KEY USING INDEX " + execute("ALTER TABLE #{table} ADD PRIMARY KEY USING INDEX " +
@ -791,7 +791,7 @@ module Mastodon
# This is necessary as we can't properly rename indexes such as # This is necessary as we can't properly rename indexes such as
# "ci_taggings_idx". # "ci_taggings_idx".
name = index.name + '_cm' name = index.name + '_cm'
# If the order contained the old column, map it to the new one. # If the order contained the old column, map it to the new one.
order = index.orders order = index.orders
if order.key?(old) if order.key?(old)

View file

@ -2,10 +2,10 @@ require 'rails_helper'
describe Settings::ApplicationsController do describe Settings::ApplicationsController do
render_views render_views
let!(:user) { Fabricate(:user) } let!(:user) { Fabricate(:user) }
let!(:app) { Fabricate(:application, owner: user) } let!(:app) { Fabricate(:application, owner: user) }
before do before do
sign_in user, scope: :user sign_in user, scope: :user
end end
@ -21,7 +21,7 @@ describe Settings::ApplicationsController do
end end
end end
describe 'GET #show' do describe 'GET #show' do
it 'returns http success' do it 'returns http success' do
get :show, params: { id: app.id } get :show, params: { id: app.id }
@ -110,7 +110,7 @@ describe Settings::ApplicationsController do
end end
end end
end end
describe 'PATCH #update' do describe 'PATCH #update' do
context 'success' do context 'success' do
let(:opts) { let(:opts) {
@ -131,7 +131,7 @@ describe Settings::ApplicationsController do
call_update call_update
expect(app.reload.website).to eql(opts[:website]) expect(app.reload.website).to eql(opts[:website])
end end
it 'redirects back to applications page' do it 'redirects back to applications page' do
expect(call_update).to redirect_to(settings_applications_path) expect(call_update).to redirect_to(settings_applications_path)
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -6,7 +6,7 @@ Content-Length: 38111
Last-Modified: Wed, 20 Jul 2016 02:50:52 GMT Last-Modified: Wed, 20 Jul 2016 02:50:52 GMT
Connection: keep-alive Connection: keep-alive
Accept-Ranges: bytes Accept-Ranges: bytes
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -21,16 +21,16 @@ Accept-Ranges: bytes
var s = document.getElementsByTagName("script")[0]; var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();
</script> </script>
<link rel="stylesheet" type="text/css" href="css/common.css"/> <link rel="stylesheet" type="text/css" href="css/common.css"/>
<script src="js/jquery-1.11.1.min.js" type="text/javascript" charset="utf-8"></script> <script src="js/jquery-1.11.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="js/common.js" type="text/javascript" charset="utf-8"></script> <script src="js/common.js" type="text/javascript" charset="utf-8"></script>
<script src="js/carousel.js" type="text/javascript" charset="utf-8"></script> <script src="js/carousel.js" type="text/javascript" charset="utf-8"></script>
<title>中国域名网站</title> <title>中国域名网站</title>
</head> </head>
<body> <body>
<div class="head-tips" id="headTip"> <div class="head-tips" id="headTip">
@ -453,7 +453,7 @@ Accept-Ranges: bytes
<li><a href="http://新疆农业大学.中国" target="_blank">新疆农业大学.中国</a></li> <li><a href="http://新疆农业大学.中国" target="_blank">新疆农业大学.中国</a></li>
<li><a href="http://浙江万里学院.中国" target="_blank">浙江万里学院.中国</a></li> <li><a href="http://浙江万里学院.中国" target="_blank">浙江万里学院.中国</a></li>
<li><a href="http://重庆大学.中国" target="_blank">重庆大学.中国</a></li> <li><a href="http://重庆大学.中国" target="_blank">重庆大学.中国</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -472,7 +472,7 @@ Accept-Ranges: bytes
<script> <script>
$("#headTip").hide() $("#headTip").hide()
var hostname = window.location.hostname || ""; var hostname = window.location.hostname || "";
var tips = "您所访问的域名 <font size='' color='#ff0000'>" + hostname +"</font> 无法到达,您可以尝试重新访问,或使用搜索相关信息" var tips = "您所访问的域名 <font size='' color='#ff0000'>" + hostname +"</font> 无法到达,您可以尝试重新访问,或使用搜索相关信息"
if (hostname != "导航.中国") { if (hostname != "导航.中国") {
$("#headTip").html(tips); $("#headTip").html(tips);

View file

@ -77,7 +77,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
params[:controller] = StreamEntriesHelper::EMBEDDED_CONTROLLER params[:controller] = StreamEntriesHelper::EMBEDDED_CONTROLLER
params[:action] = StreamEntriesHelper::EMBEDDED_ACTION params[:action] = StreamEntriesHelper::EMBEDDED_ACTION
end end
describe '#style_classes' do describe '#style_classes' do
it do it do
status = double(reblog?: false) status = double(reblog?: false)
@ -202,7 +202,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
expect(css_class).to eq 'h-cite' expect(css_class).to eq 'h-cite'
end end
end end
describe '#rtl?' do describe '#rtl?' do
it 'is false if text is empty' do it 'is false if text is empty' do
expect(helper).not_to be_rtl '' expect(helper).not_to be_rtl ''

View file

@ -62,7 +62,7 @@ describe UserSettingsDecorator do
settings.update(values) settings.update(values)
expect(user.settings['auto_play_gif']).to eq false expect(user.settings['auto_play_gif']).to eq false
end end
it 'updates the user settings value for system font in UI' do it 'updates the user settings value for system font in UI' do
values = { 'setting_system_font_ui' => '0' } values = { 'setting_system_font_ui' => '0' }

View file

@ -35,7 +35,7 @@ RSpec.describe RemoteFollow do
context 'attrs with acct' do context 'attrs with acct' do
let(:attrs) { { acct: 'gargron@quitter.no' }} let(:attrs) { { acct: 'gargron@quitter.no' }}
it do it do
is_expected.to be true is_expected.to be true
end end

View file

@ -27,7 +27,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
it 'creates status' do it 'creates status' do
status = sender.statuses.first status = sender.statuses.first
expect(status).to_not be_nil expect(status).to_not be_nil
expect(status.text).to eq 'Lorem ipsum' expect(status.text).to eq 'Lorem ipsum'
end end

View file

@ -9,7 +9,7 @@ RSpec::Matchers.define :model_have_error_on_field do |expected|
failure_message do |record| failure_message do |record|
keys = record.errors.keys keys = record.errors.keys
"expect record.errors(#{keys}) to include #{expected}" "expect record.errors(#{keys}) to include #{expected}"
end end
end end