Skip to content

Commit c629364

Browse files
committed
Allow safe navigation operator
1 parent 3001605 commit c629364

5 files changed

Lines changed: 6 additions & 7 deletions

File tree

.rubocop.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Style/ConditionalAssignment:
5454
Enabled: false
5555

5656
Style/SafeNavigation:
57-
Enabled: false
57+
MaxChainLength: 1
5858

5959
Style/NumericLiterals:
6060
Enabled: false
@@ -93,7 +93,6 @@ Style/ArgumentsForwarding:
9393
Style/DisableSyntax:
9494
DisableSyntax:
9595
- unless
96-
- safe_navigation
9796
- endless_methods
9897
- arguments_forwarding
9998
- numbered_parameters

lib/generators/online_migrations/upgrade_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def migrations_to_apply
4848
end
4949

5050
iteration_pause_column = connection.columns(:background_data_migrations).find { |c| c.name == "iteration_pause" }
51-
if iteration_pause_column && iteration_pause_column.default
51+
if iteration_pause_column&.default
5252
migrations << "background_data_migrations_remove_iteration_pause_default"
5353
end
5454

lib/online_migrations/command_checker.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -843,8 +843,8 @@ def index_corruption?
843843

844844
def index_include_column?(index, column)
845845
index.columns.include?(column) ||
846-
(index.include && index.include.include?(column)) ||
847-
(index.where && index.where.include?(column))
846+
index.include&.include?(column) ||
847+
index.where&.include?(column)
848848
end
849849

850850
def run_custom_checks(method, args)

lib/online_migrations/schema_statements.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def update_columns_in_batches(table_name, columns_and_values,
111111

112112
relation.update_all(updates)
113113

114-
progress.call(relation) if progress
114+
progress.call(relation) if progress.present?
115115

116116
sleep(pause_ms * 0.001) if pause_ms > 0
117117
end

lib/online_migrations/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def multiple_databases?
145145

146146
def run_background_migrations_inline?
147147
run_inline = OnlineMigrations.config.run_background_migrations_inline
148-
run_inline && run_inline.call
148+
run_inline.call if run_inline.present?
149149
end
150150
end
151151
end

0 commit comments

Comments
 (0)