activerecord-sqlserver-adapter 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 926f65915d98bb3c271370883fa89891fc575b5c6801cd8c235386c078d34bf5
-  data.tar.gz: 0a932a9d5edf0d3932e3f0ba44328ed77a033a1223f05699e8f4caa79116ac56
+  metadata.gz: cebd5142b6e4cd7fc42be58fc02ba1be8cef17425812d28991643dec2a079743
+  data.tar.gz: dcf926a50cc90a36bb6d41b6adae4eabae84b92d3d4844c6661a9c0d60efd478
 SHA512:
-  metadata.gz: ee45540a8d2ae57dc69a35048f4ccfbf01bcfc91e177e57405b19ccb8a3279eef7b752c22dee20c4171c8bb4e2cb0fcaadb99cd6c25d139fd2ef53577a5cb23a
-  data.tar.gz: 9184a7041e5de445103bcd47832352614897865f0ef49e83067b553786d089be73eb73c34dfaf3f102e02804ee7d8d40803d5582430ebfeecbe95f568b0b7cb7
+  metadata.gz: e4158590963a45ac2bd13ae2a8200554693a0ea9a5a2fd68ff17ec07ed25d8c03dd11efcbdb28b6dc0d56c7bd88df77e57c11a87ee375096077da78647ce80c0
+  data.tar.gz: 42a84013b9b6949f04d4eb99aa01b6727d2556dc2764b57454661f680eb4fe62541ce8fc05c74c7f7154c271601caf004fd864482d19115b1fc9cac152a4774a

data/.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
 	"name": "ActiveRecord SQL Server Adapter project development",
-	"dockerComposeFile": "docker-compose.yml",
+	"dockerComposeFile": "compose.yaml",
 	"service": "activerecord-sqlserver-adapter",
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 

data/.github/workflows/ci.yml

@@ -1,12 +1,6 @@
 name: CI
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  schedule:
-    - cron: '0 4 * * 1'
+on: [push, pull_request]
 
 jobs:
   test:
@@ -14,14 +8,14 @@ jobs:
     runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
 
     env:
-      COMPOSE_FILE: docker-compose.ci.yml
+      COMPOSE_FILE: compose.ci.yaml
 
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 3.3.4
-          - 3.2.5
+          - 3.3.6
+          - 3.2.6
 
     steps:
       - name: Checkout code

data/CHANGELOG.md

@@ -1,12 +1,24 @@
+## v8.0.2
+
+#### Fixed
+
+- [#1272](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1272) Fix parsing of raw table name from SQL with extra parentheses
+
+## v8.0.1
+
+#### Fixed
+
+- [#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.

data/README.md

@@ -18,7 +18,7 @@ See [Rubygems](https://rubygems.org/gems/activerecord-sqlserver-adapter/versions
 
 | Adapter Version | Rails Version | Support        | Branch                                                                                          |
 |-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
-| `8.0.0`         | `8.0.x`       | Active | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
+| `8.0.x`         | `8.0.x`       | Active | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)             |
 | `7.2.x`         | `7.2.x`       | Active         | [7-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-2-stable) |
 | `7.1.x`         | `7.1.x`       | Active         | [7-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-1-stable) |
 | `7.0.x`         | `7.0.x`       | Ended         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |

data/VERSION

@@ -1 +1 @@
-8.0.0
+8.0.2

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -347,12 +347,16 @@ module ActiveRecord
 
         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)
@@ -707,7 +711,7 @@ module ActiveRecord
           elsif s.match?(/^\s*UPDATE\s+.*/i)
             s.match(/UPDATE\s+([^\(\s]+)\s*/i)[1]
           else
-            s.match(/FROM\s+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
+            s.match(/FROM[\s|\(]+((\[[^\(\]]+\])|[^\(\s]+)\s*/i)[1]
           end.strip
         end
 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -3,6 +3,7 @@
 require "tiny_tds"
 require "base64"
 require "active_record"
+require "active_record/connection_adapters/statement_pool"
 require "arel_sqlserver"
 require "active_record/connection_adapters/sqlserver/core_ext/active_record"
 require "active_record/connection_adapters/sqlserver/core_ext/explain"

data/test/cases/adapter_test_sqlserver.rb

@@ -616,4 +616,13 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       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

data/test/cases/coerced_tests.rb

@@ -1183,6 +1183,9 @@ module ActiveRecord
         end
       end
 
+      # SQL Server does not support 'restrict' for 'on_update' or 'on_delete'.
+      coerce_tests! :test_remove_foreign_key_with_restrict_action
+
       # Error message depends on the database adapter.
       coerce_tests! :test_add_foreign_key_with_if_not_exists_not_set
       def test_add_foreign_key_with_if_not_exists_not_set_coerced

data/test/cases/schema_test_sqlserver.rb

@@ -101,5 +101,11 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
         assert_equal "[with].[select notation]", connection.send(:get_raw_table_name, "INSERT INTO [with].[select notation] SELECT * FROM [table_name]")
       end
     end
+
+    describe 'CREATE VIEW statements' do
+      it do
+        assert_equal "test_table_as", connection.send(:get_raw_table_name, "CREATE VIEW test_views ( test_table_a_id, test_table_b_id ) AS SELECT test_table_as.id as test_table_a_id, test_table_bs.id as test_table_b_id FROM (test_table_as with(nolock) LEFT JOIN test_table_bs with(nolock) ON (test_table_as.id = test_table_bs.test_table_a_id))")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.2
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -55,8 +55,8 @@ extra_rdoc_files: []
 files:
 - ".devcontainer/Dockerfile"
 - ".devcontainer/boot.sh"
+- ".devcontainer/compose.yaml"
 - ".devcontainer/devcontainer.json"
-- ".devcontainer/docker-compose.yml"
 - ".editorconfig"
 - ".github/issue_template.md"
 - ".github/workflows/ci.yml"
@@ -74,7 +74,7 @@ files:
 - VERSION
 - activerecord-sqlserver-adapter.gemspec
 - appveyor.yml
-- docker-compose.ci.yml
+- compose.ci.yaml
 - guides/RELEASING.md
 - lib/active_record/connection_adapters/sqlserver/core_ext/abstract_adapter.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
@@ -238,8 +238,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.0/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.0
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.2/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.2
 post_install_message:
 rdoc_options: []
 require_paths: