From 5075a010a5d1d2a36ffcedf1677094fa8a004ef7 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 8 Dec 2024 14:37:46 +0000 Subject: [PATCH 1/4] Fix CI --- VERSION | 2 +- activerecord-sqlserver-adapter.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b351275b1..cd8590d8d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.0.alpha1 +8.1.0.alpha diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index d9fdebdf1..437aa4f34 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "~> 8.0.0" + spec.add_dependency "activerecord", "~> 8.0.0.alpha" spec.add_dependency "tiny_tds" end From 320a1c9e16171162362e622e8b758d66cdc2f56f Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 8 Dec 2024 14:40:19 +0000 Subject: [PATCH 2/4] Update Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 116b439f1..6d4c1a2af 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 \ - && bundle install \ + && RAILS_BRANCH=main bundle install \ && rm -rf /tmp/activerecord-sqlserver-adapter RUN chown -R vscode:vscode /usr/local/rvm From ac59a4a11fdfcf65c7a78bb803af0e29ca7e03e5 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 8 Dec 2024 14:56:03 +0000 Subject: [PATCH 3/4] Update activerecord-sqlserver-adapter.gemspec --- activerecord-sqlserver-adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index 437aa4f34..118af47c1 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -27,6 +27,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "activerecord", "~> 8.0.0.alpha" + spec.add_dependency "activerecord", "~> 8.1.0.alpha" spec.add_dependency "tiny_tds" end From d195ae5a8fe380d09d61d722e4524147016d2760 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Sun, 8 Dec 2024 18:02:30 +0000 Subject: [PATCH 4/4] Update sqlserver_adapter.rb --- lib/active_record/connection_adapters/sqlserver_adapter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb index 314eacce1..304501834 100644 --- a/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/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"