tiny_tds 2.1.4-x86-mingw32 → 2.1.6-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4636977a24bb1b48ae9f88cbe8741896c2318accb69f818fd7de9482bf3e127
-  data.tar.gz: 05c26b702b0ee94899c26f6c30e9f73335ce83d4228e81ed168037d9a5616d47
+  metadata.gz: 5d8a7c6ae445152b99c6dd6f0a2dca45354652834ff6ff4f2c06b575fc4ad7e8
+  data.tar.gz: 6c5eeca2a2d548e14fe89f41754ebd73d4e022e08b746b56adc790df0cc3e649
 SHA512:
-  metadata.gz: 9276796af730b23fbdeac517e9529b1079d0fb607d810ae15fdb78e88f58277b8a4e23bda85915cddbf22003d0ea837be37d286a09f404294507058f15965231
-  data.tar.gz: dce67a8b59d159c5752e95620556b6d5384d798338fde8b684753228d7d237136e7a4f33517d972985880bda395b6f046a7116bd9c107a382480ada19d05f868
+  metadata.gz: 9903408f07c12cbd681f3069f13724e8486e5d75b1c98f752ab984c4889846a79a282884a59458fe31f9d094a695f8488d807fe876e2aebaa8da4854ffa0dd2c
+  data.tar.gz: f23928fa9adb6facc54c54fa3d017aef183b63b9cdbb123409f320941cc3e0ed59f9c37db67dd61c961776408c659036208cb0078e916894ebd5704fde7d9b5f

data/.circleci/config.yml

@@ -0,0 +1,407 @@
+version: 2.1
+
+orbs:
+  win: circleci/windows@4.1
+  ruby: circleci/ruby@2.0.0
+
+commands:
+  install-ruby-windows:
+    description: "Install Ruby on Windows"
+    parameters:
+      ruby_version:
+        description: 'version tag for the cimg/ruby container'
+        type: string
+    steps:
+      - run:
+          name: remove pre-installed ruby
+          command: |
+            Get-ChildItem -path 'C:\tools\' -filter Ruby* | Remove-Item -Force -Recurse
+
+      - run:
+          name: download and install ruby devkit
+          command: |
+            $ProgressPreference='SilentlyContinue'
+
+            $uri = 'https://api.github.com/repos/oneclick/rubyinstaller2/tags?per_page=200'
+            $releases = ((Invoke-WebRequest $uri) | ConvertFrom-Json).name | select-string -Pattern '<< parameters.ruby_version >>'
+            $target_release = (($releases | Sort-Object -Descending)[0] | Out-String).Trim()
+            $target_version = $target_release.Substring($target_release.Length - 7)
+            $download_uri = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-$target_version/rubyinstaller-devkit-$target_version-x64.exe"
+            echo "Ruby Target Version Found: $target_version"
+
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            Invoke-WebRequest -UseBasicParsing -uri $download_uri -OutFile C:\ruby-setup.exe
+
+            echo "Download finished, starting installation of $target_version"
+            C:\ruby-setup.exe /VERYSILENT /NORESTART /ALLUSERS /DIR=C:/Ruby<< parameters.ruby_version >>-x64
+
+      - run:
+          name: ruby diagnostics
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            echo "Perl Version:"
+            perl --version
+            echo "Ruby Version:"
+            ruby --version
+            echo "Gem Version:"
+            gem --version
+
+      - run:
+          name: install bundler
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            gem install bundler -v 2.3.26
+
+jobs:
+  test_linux:
+    parameters:
+      ruby_version:
+        description: 'version tag for the cimg/ruby container'
+        type: string
+
+    machine:
+      image: ubuntu-2004:current
+
+    # be sure to update the ./setup_cimgruby_dev.sh if changes are made to steps below
+    steps:
+      - checkout
+
+      - run:
+          name: start docker-compose build environment
+          command: |
+            sudo ./test/bin/setup_volume_permissions.sh
+            docker-compose up -d
+            echo "Waiting for containers to start..."
+            sleep 10
+          environment:
+            RUBY_VERSION: << parameters.ruby_version >>
+
+      - run:
+          name: install sql prereqs
+          command: |
+            docker exec cimg_ruby bash -c 'sudo -E ./test/bin/install-mssqltools.sh'
+
+      - run:
+          name: setup tiny_tds test database
+          command: |
+            docker exec cimg_ruby bash -c './test/bin/setup_tinytds_db.sh'
+
+      - run:
+          name: bundle install gems
+          command: |
+            docker exec cimg_ruby bash -c 'bundle install'
+
+      - run:
+          name: Write used versions into file
+          command: |
+            docker exec cimg_ruby bash -c 'bundle exec rake ports:version_file'
+
+      - restore_cache:
+          name: restore ports cache
+          keys:
+            - ports-<< parameters.ruby_version >>-{{ arch }}-{{ checksum ".ports_versions" }}
+            - ports-<< parameters.ruby_version >>-{{ arch }}-
+
+      - run:
+          name: compile ports
+          command: |
+            docker exec cimg_ruby bash -c 'bundle exec rake ports'
+
+      - run:
+          name: build gem
+          command: |
+            docker exec cimg_ruby bash -c 'bundle exec rake build'
+
+      - run:
+          name: Fix permissions on ports directory
+          command: |
+            docker exec cimg_ruby bash -c 'sudo chown -R $(id -u):$(id -g) ports'
+
+      - run:
+          name: test gem
+          command: |
+            docker exec cimg_ruby bash -c 'bundle exec rake test'
+
+      - save_cache:
+          name: save ports cache
+          paths:
+            - ./ports
+          key: ports-<< parameters.ruby_version >>-{{ arch }}-{{ arch }}-{{ checksum ".ports_versions" }}
+
+      - store_test_results:
+          path: test/reports
+
+  test_windows:
+    parameters:
+      ruby_version:
+        description: 'version tag for rubydev environment'
+        type: string
+
+    executor:
+      name: win/server-2022
+      shell: powershell.exe
+
+    environment:
+      RAKEOPT: '-rdevkit'
+      TESTOPTS: '-v'
+      MAKE: 'make V=1 -j2'
+
+    steps:
+      - install-ruby-windows:
+          ruby_version: << parameters.ruby_version >>
+
+      - checkout
+
+      - restore_cache:
+          name: restore gem cache
+          keys:
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-{{ checksum "tiny_tds.gemspec" }}
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-
+
+      - run:
+          name: bundle install gems
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            bundle install --path vendor/bundle
+
+      - save_cache:
+          name: save gem cache
+          paths:
+            - ./vendor/bundle
+          key: v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-{{ checksum "tiny_tds.gemspec" }}
+
+      - attach_workspace:
+          at: artifacts
+
+      - run:
+          name: install native gem and restore cross-compiled code from gem
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            $rubyArchitecture = (ruby -e 'puts RUBY_PLATFORM').Trim()
+            $gemVersion = (Get-Content VERSION).Trim()
+
+            gem install --local --install-dir=./tmp "artifacts/gems/tiny_tds-$gemVersion-$rubyArchitecture.gem"
+
+            # Restore precompiled code
+            $source = (Resolve-Path ".\tmp\gems\tiny_tds-$gemVersion-$rubyArchitecture\lib\tiny_tds").Path
+            $destination = (Resolve-Path ".\lib\tiny_tds").Path
+            Get-ChildItem $source -Recurse -Exclude "*.rb" | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}
+            
+            # Restore ports
+            Copy-Item -Path ".\tmp\gems\tiny_tds-$gemVersion-$rubyArchitecture\ports" -Destination "." -Recurse
+
+      - restore_cache:
+          name: restore mssql installation file
+          key: downloads-{{ checksum "test/bin/install-mssql.ps1" }}
+
+      - run:
+          name: setup mssql
+          command: |
+            .\test\bin\install-mssql.ps1
+
+      - save_cache:
+          name: save downloads cache
+          paths:
+            - C:\Downloads
+          key: downloads-{{ checksum "test/bin/install-mssql.ps1" }}
+
+      - run:
+          name: install toxiproxy-server
+          command: |
+            choco install toxiproxy-server --version=2.5.0 -y
+            Start-Process toxiproxy-server
+
+      - run:
+          name: test gem
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            bundle exec rake test
+          environment:
+            TOXIPROXY_HOST: "localhost"
+
+      - store_test_results:
+          path: test/reports
+
+      - run:
+          name: Rename gem to a consistent name to store artifact
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            $rubyArchitecture = (ruby -e 'puts RUBY_PLATFORM').Trim()
+            $gemVersion = (Get-Content VERSION).Trim()
+
+            New-Item -Path . -Name "tested_artifact" -ItemType "directory"
+            Move-Item "artifacts/gems/tiny_tds-$gemVersion-$rubyArchitecture.gem" "tested_artifact"
+
+      - store_artifacts:
+          path: tested_artifact
+
+  cross_compile_gem:
+    parameters:
+      platform:
+        description: "Platform to compile the gem resources"
+        type: string
+
+    docker:
+      - image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-<< parameters.platform >>"
+
+    steps:
+      - checkout
+
+      - run:
+          name: bundle install gems
+          command: |
+            bundle install
+
+      - run:
+          name: Write used versions for ports into file
+          command: |
+            rake ports:version_file[<< parameters.platform >>]
+
+      - restore_cache:
+          name: restore ports cache
+          keys:
+            - ports-win-{{ arch }}-{{ checksum ".ports_versions" }}
+            - ports-win-{{ arch }}-
+
+      - run:
+          name: Build gem
+          command: |
+            rake gem:for_platform[<< parameters.platform >>]
+
+      - run:
+          name: Move gems into separate directory before caching
+          command: |
+            mkdir -p artifacts-<< parameters.platform >>/gems
+            mv pkg/*.gem artifacts-<< parameters.platform >>/gems
+
+      - run:
+          name: Remove non-native gem to avoid conflict in workspace
+          command: |
+            gemVersion=$(cat VERSION | tr -d "[:space:]")
+            rm -rf artifacts-<< parameters.platform >>/gems/tiny_tds-$gemVersion.gem
+
+      - store_artifacts:
+          path: artifacts-<< parameters.platform >>/gems
+
+      - save_cache:
+          name: save ports cache
+          paths:
+            - ./ports
+          key: ports-win-{{ arch }}-{{ checksum ".ports_versions" }}
+
+      - persist_to_workspace:
+          name: save gems into workspace
+          root: artifacts-<< parameters.platform >>
+          paths:
+            - gems
+
+  install_windows:
+    parameters:
+      ruby_version:
+        description: 'version tag for rubydev environment'
+        type: string
+
+    executor:
+      name: win/server-2022
+      shell: powershell.exe
+
+    environment:
+      RAKEOPT: '-rdevkit'
+      TESTOPTS: '-v'
+      MAKE: 'make V=1 -j2'
+
+    steps:
+      - install-ruby-windows:
+          ruby_version: << parameters.ruby_version >>
+
+      - run:
+          name: Ensure msys2 installation is complete
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            
+            # on older Ruby version, the msys version shipped with RubyInstaller is quite old
+            # and RubyInstaller will be unable to install anything because of outdated keys
+            # With this those commands, we force to get a new set of keys
+            # see https://www.msys2.org/docs/updating/#potential-issues
+            ridk exec pacman-key --init
+            ridk exec pacman-key --refresh-keys
+            ridk install 1 2 3
+
+      - checkout
+
+      - restore_cache:
+          name: restore gem cache
+          keys:
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-{{ checksum "tiny_tds.gemspec" }}
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-
+            - v1-bundle-<< parameters.ruby_version >>-{{ arch }}-
+
+      - run:
+          name: bundle install gems
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            bundle install --path vendor/bundle
+
+      - save_cache:
+          name: save gem cache
+          paths:
+            - ./vendor/bundle
+          key: v1-bundle-<< parameters.ruby_version >>-{{ arch }}-{{ .Branch }}-{{ checksum "tiny_tds.gemspec" }}
+
+      - run:
+          name: build gem
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            gem build tiny_tds.gemspec
+
+      - run:
+          name: Install gem
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            $gemVersion = (Get-Content VERSION).Trim()
+            gem install --local "tiny_tds-$gemVersion.gem"
+
+      - run:
+          name: Check if gem loads correctly
+          command: |
+            $Env:PATH = "C:\\Ruby<< parameters.ruby_version >>-x64\\bin;$Env:PATH"
+            ruby -e "require 'tiny_tds'; puts TinyTds::Gem.root_path"
+            exit $LASTEXITCODE
+
+workflows:
+  test_supported_ruby_versions:
+    jobs:
+      - cross_compile_gem:
+          matrix:
+            parameters:
+              platform:
+                - "x86-mingw32"
+                - "x64-mingw32"
+                - "x64-mingw-ucrt"
+      - test_windows:
+          requires:
+            - cross_compile_gem
+          matrix: &ruby_versions
+            parameters:
+              ruby_version:
+                - '2.4'
+                - '2.5'
+                - '2.6'
+                - '2.7'
+                - '3.0'
+                - '3.1'
+                - '3.2'
+      - test_linux:
+          matrix: *ruby_versions
+
+      - install_windows:
+          matrix:
+            parameters:
+              ruby_version:
+                - '2.5'
+                - '2.6'
+                - '2.7'
+                - '3.0'
+                - '3.1'
+                - '3.2'

data/.gitignore

@@ -18,3 +18,5 @@ misc
 /exe/*
 /ports/*
 !/ports/patches/
+test/reports
+.ports_versions

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## (unreleased)
+## 2.1.6
+
+* Add Ruby 3.0, 3.1, and 3.2 to the cross compile list
+* Fix segfault when asking if client was dead after closing it. Fixes #519.
+* Mark `alloc` function as undefined on `TinyTds::Result`. Fixes #515.
+* Fix Gem installation on Windows by adding default freetds msys path. Fixes #522
+* Search for `freetds` in `/opt/homebrew` when installing on Apple Silicon. Fixes #484, #492 and #508.
+
+## 2.1.5
+
+* Fix compilation errors for Amazon Linux 1. Fixes #495.
+* Fix segfault for login timeouts
 
 ## 2.1.4
 
@@ -267,4 +278,3 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 
 ## 0.1.0 Initial release!
-

data/Gemfile

@@ -1,9 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-group :development do
-end
-
-group :test do
-  gem 'minitest'
-end

data/README.md

@@ -1,11 +1,9 @@
 # TinyTDS - Simple and fast FreeTDS bindings for Ruby using DB-Library.
 
-* [![TravisCI](https://travis-ci.org/rails-sqlserver/tiny_tds.svg?branch=master)](https://travis-ci.org/rails-sqlserver/tiny_tds) - TravisCI
-* [![Build Status](https://ci.appveyor.com/api/projects/status/g2bhhbsdkx0mal55/branch/master?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/tiny-tds/branch/master) - Appveyor
+* [![CircleCI](https://circleci.com/gh/rails-sqlserver/tiny_tds.svg?style=svg)](https://app.circleci.com/pipelines/github/rails-sqlserver/tiny_tds) - CircleCi
 * [![Gem Version](https://img.shields.io/gem/v/tiny_tds.svg)](https://rubygems.org/gems/tiny_tds) - Gem Version
 * [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter) - Community
 
-
 ## About TinyTDS
 
 The TinyTDS gem is meant to serve the extremely common use-case of connecting, querying and iterating over results to Microsoft SQL Server or Sybase databases from Ruby using the FreeTDS's DB-Library API.
@@ -409,7 +407,7 @@ For the convenience of Windows users, TinyTDS ships pre-compiled gems for suppor
 Run the following rake task to compile the gems for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
 
 ```
-$ rake gem:windows
+$ rake gem:native
 ```
 
 The compiled gems will exist in `./pkg` directory.

data/Rakefile

@@ -6,19 +6,33 @@ require 'rake/extensiontask'
 require_relative './ext/tiny_tds/extconsts'
 
 SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))
+
+ruby_cc_ucrt_versions = "3.2.0:3.1.0".freeze
+ruby_cc_mingw32_versions = "3.0.0:2.7.0:2.6.0:2.5.0:2.4.0".freeze
+
 GEM_PLATFORM_HOSTS = {
-  'x86-mingw32' => 'i686-w64-mingw32',
-  'x64-mingw32' => 'x86_64-w64-mingw32'
+  'x86-mingw32' => {
+    host: 'i686-w64-mingw32',
+    ruby_versions: ruby_cc_mingw32_versions
+  },
+  'x64-mingw32' => {
+    host: 'x86_64-w64-mingw32',
+    ruby_versions: ruby_cc_mingw32_versions
+  },
+  'x64-mingw-ucrt' => {
+    host: 'x86_64-w64-mingw32',
+    ruby_versions: ruby_cc_ucrt_versions
+  },
 }
 
 # Add our project specific files to clean for a rebuild
 CLEAN.include FileList["{ext,lib}/**/*.{so,#{RbConfig::CONFIG['DLEXT']},o}"],
-  FileList["exe/*"]
+              FileList["exe/*"]
 
 # Clobber all our temp files and ports files including .install files
 # and archives
 CLOBBER.include FileList["tmp/**/*"],
-  FileList["ports/**/*"].exclude(%r{^ports/archives})
+                FileList["ports/**/*"].exclude(%r{^ports/archives})
 
 Dir['tasks/*.rake'].sort.each { |f| load f }
 
@@ -32,15 +46,11 @@ Rake::ExtensionTask.new('tiny_tds', SPEC) do |ext|
     # The fat binary gem doesn't depend on the freetds package, since it bundles the library.
     spec.metadata.delete('msys2_mingw_dependencies')
 
-    platform_host_map = GEM_PLATFORM_HOSTS
-    gemplat = spec.platform.to_s
-    host = platform_host_map[gemplat]
-
     # We don't need the sources in a fat binary gem
     spec.files = spec.files.reject { |f| f =~ %r{^ports\/archives/} }
 
     # Make sure to include the ports binaries and libraries
-    spec.files += FileList["ports/#{host}/**/**/{bin,lib}/*"].exclude do |f|
+    spec.files += FileList["ports/#{spec.platform.to_s}/**/**/{bin,lib}/*"].exclude do |f|
       File.directory? f
     end
 
@@ -50,4 +60,3 @@ end
 
 task build: [:clean, :compile]
 task default: [:build, :test]
-

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.6

data/docker-compose.yml

@@ -7,16 +7,28 @@ services:
   mssql:
     image: metaskills/mssql-server-linux-tinytds:2017-GA
     container_name: sqlserver
+    environment:
+      ACCEPT_EULA: Y
+      SA_PASSWORD: super01S3cUr3
     ports:
       - "1433:1433"
-    networks:
-      - main-network
+    network_mode: "host"
 
   toxiproxy:
     image: shopify/toxiproxy
     container_name: toxiproxy
-    ports:
-      - "8474:8474"
-      - "1234:1234"
-    networks:
-      - main-network
+    command: '/toxiproxy -host=127.0.0.1'
+    network_mode: "host"
+
+  cimgruby:
+    image: "cimg/ruby:${RUBY_VERSION:-2.7}"
+    container_name: cimg_ruby
+    environment:
+      TESTOPTS: '-v'
+      TINYTDS_UNIT_HOST: '127.0.0.1'
+      SA_PASSWORD: super01S3cUr3
+      TOXIPROXY_HOST: '127.0.0.1'
+    command: tail -F anything
+    volumes:
+      - .:/home/circleci/project
+    network_mode: "host"

data/ext/tiny_tds/client.c

@@ -96,13 +96,14 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
       but we don't ever want to automatically retry. Instead have the app
       decide what to do.
       */
-      if (userdata->timing_out) {
+      if (userdata && userdata->timing_out) {
         return INT_CANCEL;
       }
-      else {
+      // userdata will not be set if hitting timeout during login so check for it first
+      if (userdata) {
         userdata->timing_out = 1;
-        return_value = INT_TIMEOUT;
       }
+      return_value = INT_TIMEOUT;
       cancel = 1;
       break;
 
@@ -231,6 +232,7 @@ static void rb_tinytds_client_free(void *ptr) {
     dbloginfree(cwrap->login);
   if (cwrap->client && !cwrap->closed) {
     dbclose(cwrap->client);
+    cwrap->client = NULL;
     cwrap->closed = 1;
     cwrap->userdata->closed = 1;
   }
@@ -262,6 +264,7 @@ static VALUE rb_tinytds_close(VALUE self) {
   GET_CLIENT_WRAPPER(self);
   if (cwrap->client && !cwrap->closed) {
     dbclose(cwrap->client);
+    cwrap->client = NULL;
     cwrap->closed = 1;
     cwrap->userdata->closed = 1;
   }

data/ext/tiny_tds/extconf.rb

@@ -21,9 +21,11 @@ end
 do_help if arg_config('--help')
 
 # Make sure to check the ports path for the configured host
-host = RbConfig::CONFIG['host']
+architecture = RbConfig::CONFIG['arch']
+architecture = "x86-mingw32" if architecture == "i386-mingw32"
+
 project_dir = File.expand_path("../../..", __FILE__)
-freetds_ports_dir = File.join(project_dir, 'ports', host, 'freetds', FREETDS_VERSION)
+freetds_ports_dir = File.join(project_dir, 'ports', architecture, 'freetds', FREETDS_VERSION)
 freetds_ports_dir = File.expand_path(freetds_ports_dir)
 
 # Add all the special path searching from the original tiny_tds build
@@ -33,6 +35,23 @@ DIRS = %w(
   /usr/local
 )
 
+if RbConfig::CONFIG['host_os'] =~ /darwin/i
+  # Ruby below 2.7 seems to label the host CPU on Apple Silicon as aarch64
+  # 2.7 and above print is as ARM64
+  target_host_cpu = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7') ? 'aarch64' : 'arm64'
+
+  if RbConfig::CONFIG['host_cpu'] == target_host_cpu
+    # Homebrew on Apple Silicon installs into /opt/hombrew
+    # https://docs.brew.sh/Installation
+    # On Intel Macs, it is /usr/local, so no changes necessary to DIRS
+    DIRS.unshift("/opt/homebrew")
+  end
+end
+
+if ENV["RI_DEVKIT"] && ENV["MINGW_PREFIX"] # RubyInstaller Support
+  DIRS.unshift(File.join(ENV["RI_DEVKIT"], ENV["MINGW_PREFIX"]))
+end
+
 # Add the ports directory if it exists for local developer builds
 DIRS.unshift(freetds_ports_dir) if File.directory?(freetds_ports_dir)
 

data/ext/tiny_tds/extconsts.rb

@@ -2,7 +2,7 @@
 ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1d'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1s'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
 FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.1.24"