update activerecord tests to use sanitized sql and table prefixes where appropriate

Author: barmintor

test/activerecord_provider/tc_activerecord_wrapper.rb

@@ -5,50 +5,50 @@ def test_sql_conditions_from_date
     input = "2005-12-25"
     expected = input.dup
     sql_template, sql_opts = sql_conditions(from: input)
-    assert_equal "updated_at >= :from", sql_template
+    assert_equal "dc_fields.updated_at >= :from", sql_template
     assert_equal expected, sql_opts[:from]
     sql_template, sql_opts = sql_conditions(from: Date.strptime(input, "%Y-%m-%d"))
-    assert_equal "updated_at >= :from", sql_template
+    assert_equal "dc_fields.updated_at >= :from", sql_template
     assert_equal expected, sql_opts[:from]
   end
 
   def test_sql_conditions_from_time
     input = "2005-12-25T00:00:00Z"
     expected = "2005-12-25 00:00:00"
     sql_template, sql_opts = sql_conditions(from: input)
-    assert_equal "updated_at >= :from", sql_template
+    assert_equal "dc_fields.updated_at >= :from", sql_template
     assert_equal expected, sql_opts[:from]
     sql_template, sql_opts = sql_conditions(from: Time.strptime(input, "%Y-%m-%dT%H:%M:%S%Z"))
-    assert_equal "updated_at >= :from", sql_template
+    assert_equal "dc_fields.updated_at >= :from", sql_template
     assert_equal expected, sql_opts[:from]
   end
 
   def test_sql_conditions_until_date
     input = "2005-12-25"
     expected = "2005-12-26"
     sql_template, sql_opts = sql_conditions(until: input)
-    assert_equal "updated_at < :until", sql_template
+    assert_equal "dc_fields.updated_at < :until", sql_template
     assert_equal expected, sql_opts[:until]
     sql_template, sql_opts = sql_conditions(until: Date.strptime(input, "%Y-%m-%d"))
-    assert_equal "updated_at < :until", sql_template
+    assert_equal "dc_fields.updated_at < :until", sql_template
     assert_equal expected, sql_opts[:until]
   end
 
   def test_sql_conditions_until_time
     input = "2005-12-25T00:00:00Z"
     expected = "2005-12-25 00:00:01"
     sql_template, sql_opts = sql_conditions(until: input)
-    assert_equal "updated_at < :until", sql_template
+    assert_equal "dc_fields.updated_at < :until", sql_template
     assert_equal expected, sql_opts[:until]
     sql_template, sql_opts = sql_conditions(until: Time.strptime(input, "%Y-%m-%dT%H:%M:%S%Z"))
-    assert_equal "updated_at < :until", sql_template
+    assert_equal "dc_fields.updated_at < :until", sql_template
     assert_equal expected, sql_opts[:until]
   end
 
   def test_sql_conditions_both
     input = "2005-12-25"
     sql_template, sql_opts = sql_conditions(from: input, until: input)
-    assert_equal "updated_at >= :from AND updated_at < :until", sql_template
+    assert_equal "dc_fields.updated_at >= :from AND dc_fields.updated_at < :until", sql_template
   end
 
   def setup

test/activerecord_provider/tc_ar_provider.rb

@@ -81,9 +81,9 @@ def test_deleted
 
   def test_from
     first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 90}").update_all(updated_at: Time.parse("January 1 2005"))
+    DCField.where("dc_fields.id < #{first_id + 90}").update_all(updated_at: Time.parse("January 1 2005"))
 
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
+    DCField.where("dc_fields.id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
 
 
     from_param = Time.parse("January 1 2006").getutc.iso8601
@@ -92,7 +92,7 @@ def test_from
       @provider.list_records(
         :metadata_prefix => 'oai_dc', :from => from_param)
     )
-    assert_equal DCField.where(["updated_at >= ?", from_param]).size,
+    assert_equal DCField.where(["dc_fields.updated_at >= ?", from_param]).size,
       doc.elements['OAI-PMH/ListRecords'].size
 
     doc = REXML::Document.new(
@@ -103,8 +103,8 @@ def test_from
   end
 
   def test_until
-    first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
+    first_id = DCField.order(id: :asc).first.id
+    DCField.where("dc_fields.id < ?", first_id + 10).update_all(updated_at: Time.parse("June 1 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(
@@ -114,10 +114,10 @@ def test_until
   end
 
   def test_from_and_until
-    first_id = DCField.order("id asc").first.id
+    first_id = DCField.order(id: :asc).first.id
     DCField.update_all(updated_at: Time.parse("June 1 2005"))
-    DCField.where("id < #{first_id + 50}").update_all(updated_at: Time.parse("June 15 2005"))
-    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 30 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 50).update_all(updated_at: Time.parse("June 15 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 10).update_all(updated_at: Time.parse("June 30 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(
@@ -129,8 +129,8 @@ def test_from_and_until
   end
 
   def test_bad_until_raises_exception
-    DCField.order('id asc').limit(10).update_all(updated_at: 1.year.ago)
-    DCField.order('id desc').limit(10).update_all(updated_at: 1.year.from_now)
+    DCField.order(id: :asc).limit(10).update_all(updated_at: 1.year.ago)
+    DCField.order(id: :desc).limit(10).update_all(updated_at: 1.year.from_now)
     badTimes = [
       'junk',
       'February 92nd, 2015']
@@ -142,8 +142,8 @@ def test_bad_until_raises_exception
   end
 
   def test_bad_from_raises_exception
-    DCField.order('id asc').limit(10).update_all(updated_at: 1.year.ago)
-    DCField.order('id desc').limit(10).update_all(updated_at: 1.year.from_now)
+    DCField.order(id: :asc).limit(10).update_all(updated_at: 1.year.ago)
+    DCField.order(id: :desc).limit(10).update_all(updated_at: 1.year.from_now)
 
     badTimes = [
       'junk',

test/activerecord_provider/tc_ar_sets_provider.rb

@@ -51,22 +51,22 @@ def define_sets
     set_ab = DCSet.create(:name => "Set A:B", :spec => "A:B")
 
     next_id = 0
-    DCField.limit(10).order("id asc").each do |record|
+    DCField.limit(10).order(id: :asc).each do |record|
       set_a.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_b.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_ab.dc_fields << record
       next_id = record.id
     end
 
-    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    DCField.where("dc_fields.id > ?", next_id).limit(10).order(id: :asc).each do |record|
       set_a.dc_fields << record
       set_c.dc_fields << record
       next_id = record.id
@@ -117,25 +117,25 @@ def setup
   def define_sets
     next_id = 0
 
-    ExclusiveSetDCField.limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.limit(10).order(id: :asc).each do |record|
       record.set = "A"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "A:B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
+    ExclusiveSetDCField.where("id > ?", next_id).limit(10).order(id: :asc).each do |record|
       record.set = "A"
       record.save!
       next_id = record.id

test/activerecord_provider/tc_caching_paging_provider.rb

@@ -23,9 +23,9 @@ def test_full_harvest
   end
 
   def test_from_and_until
-    first_id = DCField.order("id asc").first.id
-    DCField.where("id <= #{first_id + 25}").update_all(updated_at: Time.parse("September 15 2005"))
-    DCField.where("id < #{first_id + 50} and id > #{first_id + 25}").update_all(updated_at: Time.parse("November 1 2005"))
+    first_id = DCField.order(id: :asc).first.id
+    DCField.where("dc_fields.id <= ?", first_id + 25).update_all(updated_at: Time.parse("September 15 2005"))
+    DCField.where(["dc_fields.id < ? and dc_fields.id > ?", first_id + 50, first_id + 25]).update_all(updated_at: Time.parse("November 1 2005"))
 
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(

test/activerecord_provider/tc_simple_paging_provider.rb

@@ -43,10 +43,10 @@ def test_non_integer_identifiers_resumption
 
   def test_from_and_until
     first_id = DCField.order("id asc").first.id
-    DCField.where("id < #{first_id + 25}").update_all(updated_at: Time.parse("September 15 2005"))
-    DCField.where("id <= #{first_id + 50} and id > #{first_id + 25}").update_all(updated_at: Time.parse("November 1 2005"))
+    DCField.where("dc_fields.id < ?", first_id + 25).update_all(updated_at: Time.parse("September 15 2005"))
+    DCField.where(["dc_fields.id <= ? and dc_fields.id > ?", first_id + 50, first_id + 25]).update_all(updated_at: Time.parse("November 1 2005"))
 
-    total = DCField.where(["updated_at >= ? AND updated_at <= ?", Time.parse("September 1 2005"), Time.parse("November 30 2005")]).count
+    total = DCField.where(["dc_fields.updated_at >= ? AND dc_fields.updated_at <= ?", Time.parse("September 1 2005"), Time.parse("November 30 2005")]).count
 
     # Should return 50 records broken into 2 groups of 25.
     doc = Document.new(