Fixup tests for rails#52850

Remove unused require, quote support for sqlserver, etc.

Author: kamipo

activerecord/test/cases/associations/inner_join_association_test.rb

@@ -13,7 +13,6 @@
 require "models/sharded/blog_post"
 require "models/sharded/comment"
 require "models/friendship"
-require "models/reader"
 require "models/reference"
 require "models/job"
 
@@ -237,10 +236,10 @@ def test_find_with_conditions_on_through_reflection
   end
 
   def test_inner_joins_includes_all_nested_associations
-    queries = capture_sql { Friendship.joins(:friend_favorite_reference_job, :follower_favorite_reference_job).to_a }
-    # Match mysql and postgresql/sqlite quoting
-    quote = Regexp.union(%w[" `])
-    assert queries.any? { |sql| /#{quote}friendships#{quote}.#{quote}friend_id#{quote}/i.match?(sql) }
-    assert queries.any? { |sql| /#{quote}friendships#{quote}.#{quote}follower_id#{quote}/i.match?(sql) }
+    sql, = capture_sql { Friendship.joins(:friend_favorite_reference_job, :follower_favorite_reference_job).to_a }
+
+    escape = -> name { Regexp.escape(Friendship.lease_connection.quote_table_name(name)) }
+    assert_match %r(#{escape["friendships.friend_id"]}), sql
+    assert_match %r(#{escape["friendships.follower_id"]}), sql
   end
 end

activerecord/test/cases/associations/left_outer_join_association_test.rb

@@ -10,7 +10,6 @@
 require "models/categorization"
 require "models/person"
 require "models/friendship"
-require "models/reader"
 require "models/reference"
 require "models/job"
 
@@ -126,10 +125,10 @@ def test_does_not_override_select
   end
 
   def test_left_outer_joins_includes_all_nested_associations
-    queries = capture_sql { Friendship.left_outer_joins(:friend_favorite_reference_job, :follower_favorite_reference_job).to_a }
-    # Match mysql and postgresql/sqlite quoting
-    quote = Regexp.union(%w[" `])
-    assert queries.any? { |sql| /#{quote}friendships#{quote}.#{quote}friend_id#{quote}/i.match?(sql) }
-    assert queries.any? { |sql| /#{quote}friendships#{quote}.#{quote}follower_id#{quote}/i.match?(sql) }
+    sql, = capture_sql { Friendship.left_outer_joins(:friend_favorite_reference_job, :follower_favorite_reference_job).to_a }
+
+    escape = -> name { Regexp.escape(Friendship.lease_connection.quote_table_name(name)) }
+    assert_match %r(#{escape["friendships.friend_id"]}), sql
+    assert_match %r(#{escape["friendships.follower_id"]}), sql
   end
 end

activerecord/test/models/person.rb

@@ -19,7 +19,7 @@ class Person < ActiveRecord::Base
   has_many :bad_references
   has_many :fixed_bad_references, -> { where favorite: true }, class_name: "BadReference"
   has_one  :favorite_reference, -> { where favorite: true }, class_name: "Reference"
-  has_one :favorite_reference_job, through: :favorite_reference, source: :job
+  has_one  :favorite_reference_job, through: :favorite_reference, source: :job
   has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order("comments.id") }, through: :readers, source: :post
   has_many :first_posts, -> { where(id: [1, 2]) }, through: :readers