From c10e9a5f429cec994996b03ee4e67a5bac12a394 Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Tue, 12 Jun 2012 21:09:56 -0400 Subject: [PATCH] Be consistent in argument names for 3.2.6. --- CHANGELOG | 5 ++++- lib/grouped_scope/arish/relation/predicate_builer.rb | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0e8d1a0..773c86d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ -= master += 3.2.1 + +* Be consistent in argument names for 3.2.6. + = 3.2.0 diff --git a/lib/grouped_scope/arish/relation/predicate_builer.rb b/lib/grouped_scope/arish/relation/predicate_builer.rb index 97ef9b1..0b8b42b 100644 --- a/lib/grouped_scope/arish/relation/predicate_builer.rb +++ b/lib/grouped_scope/arish/relation/predicate_builer.rb @@ -9,12 +9,12 @@ module PredicateBuilder end module ClassMethods - def build_from_hash_with_grouped_scope(engine, attributes, default_table, check_column = true) + def build_from_hash_with_grouped_scope(engine, attributes, default_table, allow_table_name = true) attributes.select{ |column, value| GroupedScope::SelfGroupping === value }.each do |column_value| column, value = column_value attributes[column] = value.arel_table[column.to_s].in(value.ids_sql) end - build_from_hash_without_grouped_scope(engine, attributes, default_table, check_column) + build_from_hash_without_grouped_scope(engine, attributes, default_table, allow_table_name) end end