Prefix column names with model's table name in SQL.

Author: rwd

lib/oai/provider/model/activerecord_wrapper.rb

@@ -32,12 +32,12 @@ def initialize(model, options={})
     end
 
     def earliest
-      earliest_obj = model.order("#{timestamp_field} asc").first
+      earliest_obj = model.order("#{model.base_class.table_name}.#{timestamp_field} asc").first
       earliest_obj.nil? ? Time.at(0) : earliest_obj.send(timestamp_field)
     end
 
     def latest
-      latest_obj = model.order("#{timestamp_field} desc").first
+      latest_obj = model.order("#{model.base_class.table_name}.#{timestamp_field} desc").first
       latest_obj.nil? ? Time.now : latest_obj.send(timestamp_field)
     end
     # A model class is expected to provide a method Model.sets that
@@ -137,7 +137,7 @@ def next_set(find_scope, token_string)
     def select_partial(find_scope, token)
       records = find_scope.where(token_conditions(token))
         .limit(@limit)
-        .order("#{identifier_field} asc")
+        .order("#{model.base_class.table_name}.#{identifier_field} asc")
       raise OAI::ResumptionTokenException.new unless records
 
       total = find_scope.where(token_conditions(token)).count
@@ -158,7 +158,7 @@ def token_conditions(token)
 
       return sql if "0" == last_id
       # Now add last id constraint
-      sql.first << " AND #{identifier_field} > :id"
+      sql.first << " AND #{model.base_class.table_name}.#{identifier_field} > :id"
       sql.last[:id] = last_id
 
       return sql
@@ -169,12 +169,12 @@ def sql_conditions(opts)
       sql = []
       esc_values = {}
       if opts.has_key?(:from)
-        sql << "#{timestamp_field} >= :from"
+        sql << "#{model.base_class.table_name}.#{timestamp_field} >= :from"
         esc_values[:from] = parse_to_local(opts[:from])
       end
       if opts.has_key?(:until)
         # Handle databases which store fractions of a second by rounding up
-        sql << "#{timestamp_field} < :until"
+        sql << "#{model.base_class.table_name}.#{timestamp_field} < :until"
         esc_values[:until] = parse_to_local(opts[:until]) { |t| t + 1 }
       end
 
@@ -215,4 +215,3 @@ def parse_to_local(time)
 
   end
 end
-