From 1af12b8a1abe9dae6b833f32455655a822cecfde Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 7 Nov 2025 20:03:53 +0000 Subject: [PATCH 1/5] Test against latest Rails 8.1 release --- Dockerfile.ci | 2 +- compose.ci.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 222008702..0ded95afd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,6 +9,6 @@ WORKDIR $WORKDIR COPY . $WORKDIR -RUN RAILS_BRANCH=8-1-stable bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 +RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 CMD ["sh"] diff --git a/compose.ci.yaml b/compose.ci.yaml index 6997c249b..88ea57c04 100644 --- a/compose.ci.yaml +++ b/compose.ci.yaml @@ -4,7 +4,6 @@ services: ci: environment: - ACTIVERECORD_UNITTEST_HOST=sqlserver - - RAILS_BRANCH=8-1-stable build: context: . dockerfile: Dockerfile.ci @@ -12,8 +11,6 @@ services: depends_on: - "sqlserver" standardrb: - environment: - - RAILS_BRANCH=8-1-stable build: context: . dockerfile: Dockerfile.ci From 0de304423f23f19ffe9ac04f7185cd2425c8260b Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 7 Nov 2025 20:04:06 +0000 Subject: [PATCH 2/5] Test against latest Rails 8.1 release --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5068bd219..116b439f1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -25,6 +25,6 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/t RUN mkdir -p /tmp/activerecord-sqlserver-adapter COPY Gemfile VERSION activerecord-sqlserver-adapter.gemspec /tmp/activerecord-sqlserver-adapter/ RUN cd /tmp/activerecord-sqlserver-adapter \ - && RAILS_BRANCH=8-1-stable bundle install \ + && bundle install \ && rm -rf /tmp/activerecord-sqlserver-adapter RUN chown -R vscode:vscode /usr/local/rvm From 526b4457ad9877341d7bbfe4f3af8bf0536dccaa Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 7 Nov 2025 20:20:54 +0000 Subject: [PATCH 3/5] Fixed ActiveRecord gemspec dependency (#1376) --- CHANGELOG.md | 4 ++++ activerecord-sqlserver-adapter.gemspec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38287646c..72355f6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Unreleased + +- [#1376](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1376) Fixed ActiveRecord gemspec dependency. + ## v8.1.0 #### Added diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index bad85d912..596edc2ec 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "~> 8.1.0.rc1" + spec.add_dependency "activerecord", "~> 8.1.0" spec.add_dependency "tiny_tds", "~> 3.0" end From f2ec246be459ba19f95771328c548d17b65040bf Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Fri, 7 Nov 2025 20:22:05 +0000 Subject: [PATCH 4/5] Release v8.1.1 --- CHANGELOG.md | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72355f6ae..5e3c33fca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## v8.1.1 - [#1376](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1376) Fixed ActiveRecord gemspec dependency. diff --git a/VERSION b/VERSION index 8104cabd3..0e7915245 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.0 +8.1.1 From 77ed1c7424b5df67025695e7f8ab36df766600c1 Mon Sep 17 00:00:00 2001 From: Justin Dell Date: Wed, 12 Nov 2025 14:36:50 -0600 Subject: [PATCH 5/5] Fixed SQL Server database tasks (#1377) --- CHANGELOG.md | 8 ++++++++ lib/active_record/tasks/sqlserver_database_tasks.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e3c33fca..821bd1d3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ +## Unreleased + +#### Fixed + +- [#1377](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1377) Fixed SQL Server database tasks. + ## v8.1.1 +#### Fixed + - [#1376](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1376) Fixed ActiveRecord gemspec dependency. ## v8.1.0 diff --git a/lib/active_record/tasks/sqlserver_database_tasks.rb b/lib/active_record/tasks/sqlserver_database_tasks.rb index 8b18b89bd..62ca56733 100644 --- a/lib/active_record/tasks/sqlserver_database_tasks.rb +++ b/lib/active_record/tasks/sqlserver_database_tasks.rb @@ -7,7 +7,7 @@ module ActiveRecord module Tasks - class SQLServerDatabaseTasks + class SQLServerDatabaseTasks < AbstractTasks DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS" delegate :with_connection, :establish_connection, to: ActiveRecord::Base