Merge branch 'main' into update-all-composite-key

Author: aidanharan

.devcontainer/Dockerfile

@@ -6,9 +6,9 @@ FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
 
 # TinyTDS
 RUN apt-get -y install libc6-dev \
-    && wget http://www.freetds.org/files/stable/freetds-1.1.32.tar.gz \
-    && tar -xzf freetds-1.1.32.tar.gz \
-    && cd freetds-1.1.32 \
+    && wget http://www.freetds.org/files/stable/freetds-1.4.14.tar.gz \
+    && tar -xzf freetds-1.4.14.tar.gz \
+    && cd freetds-1.4.14 \
     && ./configure --prefix=/usr/local --with-tdsver=7.3 \
     && make \
     && make install

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1.4
-          - 3.2.2
-          - 3.3.0
+          - 3.1.6
+          - 3.2.4
+          - 3.3.2
 
     steps:
       - name: Checkout code

Dockerfile.ci

@@ -9,6 +9,6 @@ WORKDIR $WORKDIR
 
 COPY . $WORKDIR
 
-RUN RAILS_BRANCH=7-2-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"]

Gemfile

@@ -8,7 +8,7 @@ gemspec
 
 gem "bcrypt"
 gem "pg",      ">= 0.18.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", ">= 1.6.6"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "benchmark-ips"
 gem "minitest", ">= 5.15.0"

VERSION

@@ -1 +1 @@
-7.2.0.alpha
+7.2.0.beta2

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", "~> 7.2.0.alpha"
+  spec.add_dependency "activerecord", "~> 7.2.0.beta2"
   spec.add_dependency "tiny_tds"
 end

docker-compose.ci.yml

@@ -5,7 +5,6 @@ services:
   ci:
     environment:
       - ACTIVERECORD_UNITTEST_HOST=sqlserver
-      - RAILS_BRANCH=7-2-stable
     build:
       context: .
       dockerfile: Dockerfile.ci

test/cases/rake_test_sqlserver.rb

@@ -138,18 +138,22 @@ class SQLServerRakeStructureDumpLoadTest < SQLServerRakeTest
 
   it "dumps structure and accounts for defncopy oddities" do
     skip "debug defncopy on windows later" if host_windows?
+
     quietly { db_tasks.structure_dump configuration, filename }
+
     _(filedata).wont_match %r{\AUSE.*\z}
     _(filedata).wont_match %r{\AGO.*\z}
-    _(filedata).must_match %r{email\s+nvarchar\(4000\)}
-    _(filedata).must_match %r{background1\s+nvarchar\(max\)}
-    _(filedata).must_match %r{background2\s+text\s+}
+    _(filedata).must_match %r{\[email\]\s+nvarchar\(4000\)}
+    _(filedata).must_match %r{\[background1\]\s+nvarchar\(max\)}
+    _(filedata).must_match %r{\[background2\]\s+text\s+}
   end
 
   it "can load dumped structure" do
     skip "debug defncopy on windows later" if host_windows?
+
     quietly { db_tasks.structure_dump configuration, filename }
-    _(filedata).must_match %r{CREATE TABLE dbo\.users}
+
+    _(filedata).must_match %r{CREATE TABLE \[dbo\]\.\[users\]}
     db_tasks.purge(configuration)
     _(connection.tables).wont_include "users"
     db_tasks.load_schema db_config, :sql, filename