From f64d91d881e81d05461bfca47271d2933c2df3fe Mon Sep 17 00:00:00 2001
From: Aidan Haran <aidanharan@yahoo.com>
Date: Thu, 21 Nov 2024 12:09:14 +0000
Subject: [PATCH 1/3] Fix issue with distinct alias when multiple databases
 used

---
 .../connection_adapters/sqlserver/schema_statements.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb
index ba4541a52..1cc1a1b67 100644
--- a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb
+++ b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb
@@ -347,12 +347,16 @@ def add_timestamps(table_name, **options)
 
         def columns_for_distinct(columns, orders)
           order_columns = orders.reject(&:blank?).map { |s|
-                            s = s.to_sql unless s.is_a?(String)
+                            s = visitor.compile(s) unless s.is_a?(String)
                             s.gsub(/\s+(?:ASC|DESC)\b/i, "")
                              .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, "")
-                          }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
+                            }
+                            .reject(&:blank?)
+                            .reject { |s| columns.include?(s) }
 
-          (order_columns << super).join(", ")
+          order_columns_aliased = order_columns.map.with_index { |column, i| "#{column} AS alias_#{i}" }
+
+          (order_columns_aliased << super).join(", ")
         end
 
         def update_table_definition(table_name, base)

From cc491ad77a028ee1d6ef79caa352f61331026481 Mon Sep 17 00:00:00 2001
From: Aidan Haran <aidanharan@yahoo.com>
Date: Thu, 21 Nov 2024 13:03:41 +0000
Subject: [PATCH 2/3] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7700e9882..7c37e4cf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+#### Fixed
+
+- [#1262](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1262) Fix distinct alias when multiple databases used
+
 ## v8.0.0
 
 #### Changed

From d4609376bd424d773ea53042ba4ed85b8e753950 Mon Sep 17 00:00:00 2001
From: Aidan Haran <aidanharan@yahoo.com>
Date: Sat, 23 Nov 2024 09:47:52 +0000
Subject: [PATCH 3/3] Added test

---
 CHANGELOG.md                         | 8 ++++----
 test/cases/adapter_test_sqlserver.rb | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c37e4cf1..56cb70868 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,17 @@
 
 #### Fixed
 
-- [#1262](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1262) Fix distinct alias when multiple databases used
+- [#1262](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1262) Fix distinct alias when multiple databases used.
 
 ## v8.0.0
 
 #### Changed
 
-- [#1216](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1216) Refactor adapter interface to match abstract adapter
-- [#1225](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1225) Drop support to Ruby 3.1
+- [#1216](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1216) Refactor adapter interface to match abstract adapter.
+- [#1225](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1225) Drop support to Ruby 3.1.
 
 #### Fixed
 
-- [#1215](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1215) Fix mismatched foreign key errors
+- [#1215](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1215) Fix mismatched foreign key errors.
 
 Please check [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-2-stable/CHANGELOG.md) for previous changes.
diff --git a/test/cases/adapter_test_sqlserver.rb b/test/cases/adapter_test_sqlserver.rb
index 28a310c51..96cc70bf0 100644
--- a/test/cases/adapter_test_sqlserver.rb
+++ b/test/cases/adapter_test_sqlserver.rb
@@ -616,4 +616,13 @@ def setup
       assert_equal Task.where("starting < ?", DateTime.current).count, 1
     end
   end
+
+  describe "distinct select query" do
+    it "generated SQL does not contain unnecessary alias projection" do
+      sqls = capture_sql do
+        Post.includes(:comments).joins(:comments).first
+      end
+      assert_no_match(/AS alias_0/, sqls.first)
+    end
+  end
 end