Fix randomly failing test (#797)

Author: aidanharan

test/cases/coerced_tests.rb

@@ -205,6 +205,17 @@ def test_belongs_to_with_primary_key_joins_on_correct_column_coerced
     assert_no_match(/\[firm_with_primary_keys_companies\]\.\[id\]/, sql)
     assert_match(/\[firm_with_primary_keys_companies\]\.\[name\]/, sql)
   end
+
+  # Asserted SQL to get one row different from original test.
+  coerce_tests! :test_belongs_to
+  def test_belongs_to_coerced
+    client = Client.find(3)
+    first_firm = companies(:first_firm)
+    assert_sql(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
+      assert_equal first_firm, client.firm
+      assert_equal first_firm.name, client.firm.name
+    end
+  end
 end
 
 
@@ -656,7 +667,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
   def test_has_one_coerced
     firm = companies(:first_firm)
     first_account = Account.find(1)
-    assert_sql(/FETCH NEXT @1 ROWS ONLY(.)*@1 = 1/) do
+    assert_sql(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
       assert_equal first_account, firm.account
       assert_equal first_account.credit_limit, firm.account.credit_limit
     end
@@ -671,7 +682,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   coerce_tests! :test_has_one_through_executes_limited_query
   def test_has_one_through_executes_limited_query_coerced
     boring_club = clubs(:boring_club)
-    assert_sql(/FETCH NEXT @3 ROWS ONLY(.)*@3 = 1/) do
+    assert_sql(/FETCH NEXT @(\d) ROWS ONLY(.)*@\1 = 1/) do
       assert_equal boring_club, @member.general_club
     end
   end
@@ -680,21 +691,6 @@ def test_has_one_through_executes_limited_query_coerced
 
 
 
-class BelongsToAssociationsTest < ActiveRecord::TestCase
-  # Asserted SQL to get one row different from original test.
-  coerce_tests! :test_belongs_to
-  def test_belongs_to_coerced
-    client = Client.find(3)
-    first_firm = companies(:first_firm)
-    assert_sql(/FETCH NEXT @3 ROWS ONLY(.)*@3 = 1/) do
-      assert_equal first_firm, client.firm
-      assert_equal first_firm.name, client.firm.name
-    end
-  end
-end
-
-
-
 
 require 'models/company'
 class InheritanceTest < ActiveRecord::TestCase