Skip to content

Commit bfdb5ce

Browse files
authored
Fixes rubocop warnings (citusdata#246)
1 parent 56fac92 commit bfdb5ce

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Lint/ConstantDefinitionInBlock:
1919
Lint/EmptyBlock:
2020
Enabled: false
2121

22+
Lint/ShadowedArgument:
23+
IgnoreImplicitReferences: true
24+
2225
Style/ClassAndModuleChildren:
2326
Enabled: false
2427

lib/activerecord-multi-tenant/model_extensions.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def skip_statement_cache?(*scope)
201201
return true if through_klass.respond_to?(:scoped_by_tenant?) && through_klass.scoped_by_tenant?
202202
end
203203

204-
super(*scope)
204+
super
205205
end
206206
end
207207
end

lib/activerecord-multi-tenant/query_rewriter.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def initialize(arel)
8080
def visit_Arel_Attributes_Attribute(*args)
8181
return if @current_context.nil?
8282

83-
super(*args)
83+
super
8484
end
8585

8686
def visit_Arel_Nodes_Equality(obj, *args)
@@ -91,7 +91,7 @@ def visit_Arel_Nodes_Equality(obj, *args)
9191
@current_context.visited_handled_relation(obj.left.relation)
9292
end
9393
end
94-
super(obj, *args)
94+
super
9595
end
9696

9797
def visit_MultiTenant_TenantEnforcementClause(obj, *)
@@ -244,7 +244,7 @@ def visit_MultiTenant_TenantJoinEnforcementClause(obj, collector)
244244

245245
module DatabaseStatements
246246
def join_to_update(update, *args)
247-
update = super(update, *args)
247+
update = super
248248
model = MultiTenant.multi_tenant_model_for_table(MultiTenant::TableNode.table_name(update.ast.relation))
249249
if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
250250
update.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
@@ -253,7 +253,7 @@ def join_to_update(update, *args)
253253
end
254254

255255
def join_to_delete(delete, *args)
256-
delete = super(delete, *args)
256+
delete = super
257257
model = MultiTenant.multi_tenant_model_for_table(MultiTenant::TableNode.table_name(delete.ast.left))
258258
if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
259259
delete.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
@@ -266,15 +266,15 @@ def update(arel, name = nil, binds = [])
266266
if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
267267
arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
268268
end
269-
super(arel, name, binds)
269+
super
270270
end
271271

272272
def delete(arel, name = nil, binds = [])
273273
model = MultiTenant.multi_tenant_model_for_arel(arel)
274274
if model.present? && !MultiTenant.with_write_only_mode_enabled? && MultiTenant.current_tenant_id.present?
275275
arel.where(MultiTenant::TenantEnforcementClause.new(model.arel_table[model.partition_key]))
276276
end
277-
super(arel, name, binds)
277+
super
278278
end
279279
end
280280
end
@@ -379,7 +379,7 @@ def cached_find_by_statement(key, &block)
379379
return super unless respond_to?(:scoped_by_tenant?) && scoped_by_tenant?
380380

381381
key = Array.wrap(key) + [MultiTenant.current_tenant_id.to_s]
382-
super(key, &block)
382+
super
383383
end
384384
end
385385

0 commit comments

Comments
 (0)