Fixed the ordering of optimizer hints in the generated SQL (#1255)

CHANGELOG.md

@@ -5,6 +5,7 @@
 - [#1244](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1244) Allow INSERT statements with SELECT notation
 - [#1247](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1247) Fix queries with date and date-time placeholder conditions
 - [#1249](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1249) Binary basic columns should be limitable
+- [#1255](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1255)Fixed the ordering of optimizer hints in the generated SQL
 
 ## v7.2.1
 

lib/arel/visitors/sqlserver.rb

@@ -134,26 +134,24 @@ def visit_Arel_Nodes_HomogeneousIn(o, collector)
 
       def visit_Arel_Nodes_SelectStatement(o, collector)
         @select_statement = o
+        optimizer_hints = nil
         distinct_One_As_One_Is_So_Not_Fetch o
         if o.with
           collector = visit o.with, collector
           collector << " "
         end
-        collector = o.cores.inject(collector) { |c, x|
-          visit_Arel_Nodes_SelectCore(x, c)
-        }
+        collector = o.cores.inject(collector) do |collect, core|
+          optimizer_hints = core.optimizer_hints if core.optimizer_hints
+          visit_Arel_Nodes_SelectCore(core, collect)
+        end
         collector = visit_Orders_And_Let_Fetch_Happen o, collector
         collector = visit_Make_Fetch_Happen o, collector
+        collector = maybe_visit optimizer_hints, collector
         collector
       ensure
         @select_statement = nil
       end
 
-      def visit_Arel_Nodes_SelectCore(o, collector)
-        collector = super
-        maybe_visit o.optimizer_hints, collector
-      end
-
       def visit_Arel_Nodes_OptimizerHints(o, collector)
         hints = o.expr.map { |v| sanitize_as_option_clause(v) }.join(", ")
         collector << "OPTION (#{hints})"

test/cases/optimizer_hints_test_sqlserver.rb

@@ -36,6 +36,15 @@ class OptimizerHitsTestSQLServer < ActiveRecord::TestCase
     end
   end
 
+
+  it "support order" do
+    assert_queries_match(%r{\ASELECT .+ FROM .+ ORDER .+ OPTION .+\z}) do
+      companies = Company.optimizer_hints("LABEL='FindCompanies'")
+      companies = companies.order(:id)
+      companies.to_a
+    end
+  end
+
   it "sanitize values" do
     assert_queries_match(%r{\ASELECT .+ FROM .+ OPTION \(HASH GROUP\)\z}) do
       companies = Company.optimizer_hints("OPTION (HASH GROUP)")