Merge branch 'master' of git://github.com/mhawkins/dataset into mhawk…

…ins/master
aiwilliams · Apr 8, 2009 · b079cff · b079cff
2 parents 9b10a6b + 14c3ae6
commit b079cff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/dataset/record/meta.rb b/lib/dataset/record/meta.rb
@@ -36,13 +36,13 @@ def timestamp_columns
 
       def id_finder_names
         @id_finder_names ||= begin
-          names = record_class.self_and_descendents_from_active_record.collect {|c| finder_name c}
+          names = record_class.self_and_descendants_from_active_record.collect {|c| finder_name c}
           names.uniq.collect {|n| "#{n}_id".to_sym}
         end
       end
 
       def model_finder_names
-        @record_finder_names ||= record_class.self_and_descendents_from_active_record.collect {|c| finder_name(c).pluralize.to_sym}.uniq
+        @record_finder_names ||= record_class.self_and_descendants_from_active_record.collect {|c| finder_name(c).pluralize.to_sym}.uniq
       end
 
       def to_s