arel_extensions 2.0.21 → 2.2.2

data/bin/build

@@ -0,0 +1,15 @@
+#! /usr/bin/env sh
+set -e
+
+# VERSION ~> 1
+echo "Packaging v1"
+cp ./version_v1.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v1.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
+
+# VERSION ~> 2
+echo "Packaging v2"
+cp ./version_v2.rb lib/arel_extensions/version.rb
+cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+gem build ./arel_extensions.gemspec
+

data/bin/compose

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+IFS=$'\n\t'
+set -euo pipefail
+
+docker compose -f dev/compose.yaml up --exit-code-from arelx

data/bin/publish

@@ -0,0 +1,8 @@
+#! /usr/bin/env sh
+set -e
+
+find . -name "arel_extensions*.gem" | while read packaged_gem ; do
+  echo "Publishing $packaged_gem"
+  gem push "$packaged_gem"
+done
+

data/dev/arelx.dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:22.04
+
+ENV RBENV_ROOT=/opt/rbenv
+ENV PATH=${RBENV_ROOT}/shims:${RBENV_ROOT}/bin:${PATH}
+ENV APP_HOME=/app
+# I know there's a more reliable way, but this is simpler.
+ENV IN_DOCKER=true
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN mkdir -p $APP_HOME
+
+RUN apt-get update -q && apt-get install -y \
+  curl bundler build-essential git gnupg locales \
+  libbz2-dev libffi-dev liblzma-dev lsb-release libsqlite3-dev libyaml-dev \
+  make openjdk-17-jdk-headless ruby-dev ruby-full tzdata zlib1g-dev \
+  && ln -fs /usr/share/zoneinfo/UTC /etc/localtime \
+  && dpkg-reconfigure --frontend noninteractive tzdata
+
+RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list \
+  && curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc \
+  && curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/mssql-release.list \
+  && apt-get update -q
+
+RUN ACCEPT_EULA=y DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  freetds-dev libmysqlclient-dev mysql-client msodbcsql18 mssql-tools18 unixodbc-dev libpq-dev \
+  && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* \
+  && locale-gen en_US.UTF-8
+
+RUN /bin/bash -c "source ~/.bashrc"
+
+RUN mkdir -p ${RBENV_ROOT} \
+  && git clone https://github.com/rbenv/rbenv.git ${RBENV_ROOT} \
+  && git clone --depth 1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build \
+  && rbenv init - \
+  && rbenv global system
+
+WORKDIR $APP_HOME
+COPY ./dev/rbenv ./dev/rbenv
+COPY ./.github/workflows/ruby.yml ./.github/workflows/ruby.yml
+RUN /usr/bin/gem install colorize psych toml-rb
+RUN ./dev/rbenv install && rm ./dev/rbenv ./.github/workflows/ruby.yml

data/dev/compose.yaml

@@ -0,0 +1,71 @@
+name: arelx
+services:
+  arelx:
+    container_name: arelx-build
+    build:
+      context: ..
+      dockerfile: dev/arelx.dockerfile
+    volumes:
+      - ../:/app
+    entrypoint: ["/usr/bin/ruby", "dev/rbenv", "test"]
+    network_mode: "host"
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      mssql:
+        condition: service_healthy
+  mariadb:
+    image: mariadb:11.0
+    container_name: mariadb
+    environment:
+      MARIADB_DATABASE: arelx_test
+      MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
+    ports:
+      - "3306:3306"
+    network_mode: "host"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+  postgres:
+    build:
+      context: ..
+      dockerfile: dev/postgres.dockerfile
+    container_name: postgres
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: secret
+      POSTGRES_DB: arelx_test
+    ports:
+      - "5432:5432"
+    network_mode: "host"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+  mssql:
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    container_name: mssql
+    environment:
+      MSSQL_SA_PASSWORD: Password12!
+      ACCEPT_EULA: Y
+    ports:
+      - "1433:1433"
+    network_mode: "host"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $${MSSQL_SA_PASSWORD} -Q 'SELECT 1'",
+        ]
+      interval: 30s
+      retries: 5
+      timeout: 10s
+
+networks:
+  default:
+    name: arelx-network

data/dev/postgres.dockerfile

@@ -0,0 +1,5 @@
+FROM postgres:16
+
+RUN locale-gen fr_FR.utf8 && update-locale
+RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
+# ENV LANG fr_FR.utf8

data/dev/rbenv

@@ -0,0 +1,189 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'colorize'
+require 'etc'
+require 'open3'
+require 'pathname'
+require 'stringio'
+require 'toml-rb'
+require 'psych'
+
+workflow = Pathname('.github/workflows/ruby.yml').read.gsub!(/rails: (\d(_\d)?)/, 'rails: "\1"')
+jobs = Psych.load(workflow, symbolize_names: true)[:jobs]
+data = {}
+jobs.each do |name, details|
+  details[:strategy][:matrix][:versions].each do |entry|
+    db = name.to_s.gsub(/\Ajob_test_/, '').to_sym
+    ruby = entry[:ruby]
+    rails = entry[:rails]
+    arelx = entry[:arelx]
+    gemspec = :"arel_extensions-v#{arelx}"
+    gemfile = :"rails#{rails}"
+
+    data[db] ||= {}
+    data[db][gemspec] ||= {}
+    data[db][gemspec][gemfile] ||= []
+    data[db][gemspec][gemfile] << ruby
+    data[db][gemspec][gemfile].sort!
+  end
+end
+
+MATRIX = data.freeze
+
+def sh(command, exit_on_fail: true, stealth: false)
+  cmd, args = command.split(' ', 2)
+  puts "#{'$'.green.bold} #{cmd.blue} #{args&.yellow}"
+  Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+    stdin.close
+    out, err =
+      if stealth
+        [StringIO.new, StringIO.new]
+      else
+        [$stdout, $stderr]
+      end
+    th_out = Thread.new do
+      stdout.each_line { |line| out.puts line }
+    end
+    th_err = Thread.new do
+      stderr.each_line { |line| err.puts line }
+    end
+
+    th_out.join
+    th_err.join
+    wait_thr.join
+    exit_status = wait_thr.value.exitstatus
+    if exit_status.nonzero?
+      warn "'#{command}' failed with exit status #{exit_status}. Aborting …".red
+      warn stderr if !stealth
+      exit exit_status if exit_on_fail
+    end
+
+    if stealth
+      [out.string, err.string, (exit_status if !exit_on_fail)].compact
+    end
+  end
+end
+
+module RBEnv
+  RBENV_ROOT =
+    if (root = ENV['RBENV_ROOT']) && root && !root.strip.empty?
+      Pathname(root)
+    else
+      Pathname(Dir.home).join('.rbenv')
+    end.freeze
+  RBENV_BUILD = RBENV_ROOT.join('plugins').join('ruby-build').freeze
+  SHELL = Pathname(Etc.getpwuid.shell).basename.to_s.downcase.to_sym
+
+  def self.available_versions
+    out, _ = sh "rbenv versions --bare", stealth: true
+    res = out.lines.map(&:strip)
+    warn res
+    res
+  end
+
+  def self.ensure(ruby_version)
+    version = RBEnv.resolve_to_latest(ruby_version)
+    if self.installed?(version)
+      puts "#{version.yellow} already installed. Skipping …"
+    else
+      puts "Installing #{version.yellow}"
+      sh "rbenv install #{version}"
+    end
+    version
+  end
+
+  def self.install
+    if RBENV_ROOT.exist?
+      puts "#{RBENV_ROOT} exists. Skipping …"
+    else
+      sh "git clone --depth 1 https://github.com/rbenv/rbenv.git #{RBENV_ROOT}"
+      puts "Setup your shell to recognize rbenv. Check github.com/rbenv/rbenv."
+    end
+
+    if RBENV_BUILD.exist?
+      puts "#{RBENV_BUILD} exists. Skipping …"
+    else
+      sh "git clone --depth 1 https://github.com/rbenv/ruby-build.git #{RBENV_BUILD}"
+    end
+  end
+
+  def self.installed?(version)
+    installed = available_versions
+    puts "installed? = #{installed}"
+    installed && !installed.empty? && installed.include?(version)
+  end
+
+  def self.resolve_to_latest(version)
+    out, _ = sh "rbenv install --list-all", stealth: true
+    out
+      .lines
+      .map(&:strip)
+      .select { |v| v.match(/^#{Regexp.escape(version)}\.\d+/) }
+      .max_by { |v| v.split('.').map(&:to_i) }
+  end
+
+  def self.set(version)
+    sh "rbenv local #{version}"
+  end
+end
+
+module CI
+  def self.help(*_args)
+    puts "Usage:"
+    puts "    #{$0} [#{CI.singleton_class.instance_methods(false).sort.join(' | ')}]"
+    puts
+    puts "You can ask for many commands."
+  end
+
+  def self.install(*_args)
+    RBEnv.install
+    MATRIX
+      .flat_map { |_, db|
+        db.flat_map { |_, arelx|
+          arelx.flat_map { |rails, rubies|
+            rails.start_with?("rails") ? rubies : []
+          }
+        }
+      }
+      .uniq
+      .sort
+      .each do |version|
+        RBEnv.ensure(version)
+      end
+  end
+
+  # @param args [Array<String>] a list of databases to test
+  def self.test(*args)
+    puts "Requested DBs: #{args.inspect}"
+    MATRIX.each do |db, arelx|
+      puts "db = #{db}; #{!args.empty? && args.include?(db)}"
+      if args.empty? || args.include?(db)
+        puts "Testing #{db}"
+      else
+        puts "Skipping #{db}"
+        next
+      end
+      arelx.each do |arelx_version, rails|
+        sh "cp ./gemspecs/#{arelx_version}.gemspec ./arel_extensions.gemspec"
+        rails.each do |rails_version, ruby|
+          sh "cp ./gemfiles/#{rails_version}.gemfile ./Gemfile"
+          ruby.each do |ruby_version|
+            full_version = RBEnv.ensure(ruby_version)
+            RBEnv.set(full_version)
+            sh "ruby --version"
+            sh "which ruby"
+            sh "rm -rf Gemfile.lock vendor"
+            sh "bundle config set --local path vendor"
+            sh "bundle install"
+            sh "bundle exec rake test:#{db}"
+          end
+        end
+      end
+    end
+  end
+end
+
+# main
+command = ARGV.size.nonzero? ? ARGV : %w[help]
+CI.send(command[0], *command[1..])

data/gemfiles/rails3.gemfile

@@ -1,20 +1,20 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'arel', '~> 3.0' # too old...
 
 group :development, :test do
-  gem "sqlite3", '<= 1.3.13', platform: [:ruby, :mswin, :mingw]
-  gem "mysql2", '0.4.10', platform: [:ruby, :mswin, :mingw]
-  gem "activerecord-mysql2-adapter", platform: [:ruby, :mswin, :mingw]
-  gem "pg", platform: [:ruby, :mswin, :mingw]
+  gem 'sqlite3', '<= 1.3.13', platform: %i[ruby mswin mingw]
+  gem 'mysql2', '0.4.10', platform: %i[ruby mswin mingw]
+  gem 'activerecord-mysql2-adapter', platform: %i[ruby mswin mingw]
+  gem 'pg', platform: %i[ruby mswin mingw]
   # for JRuby
-  gem "jdbc-sqlite3", platform: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-  gem "activerecord-jdbcmysql-adapter", platform: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+  gem 'jdbc-sqlite3', platform: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
   gem 'activesupport', '~> 3.2'
   gem 'activemodel', '~> 3.2'
   gem 'activerecord', '~> 3.2'
 end
 
-gemspec path: "../"
+gemspec path: Dir.pwd

data/gemfiles/rails4_2.gemfile

@@ -0,0 +1,38 @@
+source 'https://rubygems.org'
+
+gem 'arel', '~> 6.0'
+
+group :development, :test do
+  # We need to explicitly include bigdecimal for ruby 2.7 .
+  # See https://github.com/ruby/bigdecimal for details.
+  rb_version = Gem::Version.new(RUBY_VERSION)
+  if Gem::Version.new('2.7') <= rb_version && rb_version < Gem::Version.new('2.8')
+     gem 'bigdecimal', '~> 1.3.5', platforms: %i[mri mingw x64_mingw mswin]
+  end
+
+  gem 'activesupport', '~> 4.0'
+  gem 'activemodel', '~> 4.0'
+  gem 'activerecord', '~> 4.0'
+
+  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
+  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
+  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
+
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 4.2.0', platforms: %i[mri mingw x64_mingw mswin]
+
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', '~> 1.3', platforms: :jruby
+  gem 'jdbc-sqlite3', '~> 3.28', platforms: :jruby
+  gem 'jdbc-postgres', '~> 42.2', platforms: :jruby
+  gem 'jdbc-mysql', '~> 5.1', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/gemfiles/rails5.gemfile

@@ -0,0 +1,29 @@
+source 'https://rubygems.org'
+
+gem 'arel', '~> 7.0'
+
+group :development, :test do
+  gem 'activesupport', '~> 5.0'
+  gem 'activemodel', '~> 5.0'
+  gem 'activerecord', '5.0.6'
+
+  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
+  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
+  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
+
+  gem 'tiny_tds', platforms: %i[mri mingw] if RUBY_PLATFORM.match?(/windows/)
+  # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
+
+  # for JRuby
+  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v50.0', platforms: :jruby
+  gem 'jdbc-sqlite3', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
+end
+
+gemspec path: Dir.pwd

data/gemfiles/rails5_1_4.gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'rails', '5.1.4'
 gem 'arel', '~> 8'
@@ -8,23 +8,23 @@ group :development, :test do
   gem 'activemodel', '5.1.4'
   gem 'activerecord', '5.1.4'
 
-  gem "sqlite3", '<= 1.3.13', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.4.10', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
+  gem 'sqlite3', '<= 1.3.13', platforms: %i[mri mswin mingw]
+  gem 'mysql2', '0.4.10', platforms: %i[mri mswin mingw]
+  gem 'pg', '< 1.0.0', platforms: %i[mri mingw]
 
-  gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  # gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+  gem 'tiny_tds', platforms: %i[mri mingw]  if RUBY_PLATFORM.match?(/windows/)
+  # gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
   gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v51.0', platforms: :jruby
-  gem "jdbc-sqlite3", platforms: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
+  gem 'jdbc-sqlite3', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmssql-adapter', platforms: :jruby
 end
 
-gemspec path: "../"
+gemspec path: Dir.pwd

data/gemfiles/rails5_2.gemfile

@@ -1,30 +1,32 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'rails', '~> 5.2.0'
 gem 'arel', '~> 9'
 
 group :development, :test do
+  gem 'bigdecimal', '1.3.5', platforms: %i[mri mingw x64_mingw mswin]
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
   gem 'activerecord', '~> 5.2.0'
 
-  gem "sqlite3", '<= 1.3.13', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.4.10', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
+  gem 'sqlite3', '<= 1.3.13', platforms: [:mri]
+  gem 'mysql2', '0.4.10', platforms: [:mri]
+  gem 'pg', '< 1.0.0', platforms: [:mri]
 
-  gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  # gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 5.2', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v52.0', platforms: :jruby
-  gem "jdbc-sqlite3", platforms: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
+  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', tag: 'v52.7', platforms: :jruby
+  gem 'jdbc-sqlite3', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlserver-adapter', '~> 52.0', platforms: :jruby
 end
 
-gemspec path: "../"
+gemspec path: Dir.pwd

data/gemfiles/rails6.gemfile

@@ -1,30 +1,33 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'rails', '~> 6.0.0'
 
-
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
   gem 'activerecord', '~> 6.0.0'
 
-  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
+  gem 'sqlite3', '~> 1.4', platforms: [:mri]
+  gem 'mysql2', '0.5.2', platforms: [:mri]
+  gem 'pg', '< 1.0.0', platforms: [:mri]
 
-  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 6.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', platforms: :jruby
-  gem "jdbc-sqlite3", platforms: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
+  gem 'activerecord-jdbc-alt-adapter', '~> 60.0', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platforms: :jruby
 end
 
-gemspec path: "../"
+gemspec path: Dir.pwd

data/gemfiles/rails6_1.gemfile

@@ -1,30 +1,33 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'rails', '~> 6.1.0'
 
-
 group :development, :test do
+  gem 'ruby-lsp', platforms: %i[mri]
+  gem 'debug', platforms: %i[mri]
+
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'
   gem 'activerecord', '~> 6.1.0'
 
-  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'~> 1.1', platforms: [:mri, :mingw]
+  gem 'sqlite3', '~> 1.4', platforms: [:mri]
+  gem 'mysql2', '~>0.5', platforms: [:mri]
+  gem 'pg', '~> 1.1', platforms: [:mri]
 
-  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
+  gem 'tiny_tds', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'activerecord-sqlserver-adapter', '~> 6.1.0', platforms: %i[mri mingw x64_mingw mswin]
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', platforms: %i[mri mswin mingw] if ENV.has_key? 'ORACLE_HOME'
   gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
 
   # for JRuby
-  gem 'activerecord-jdbc-adapter', platforms: :jruby
-  gem "jdbc-sqlite3", platforms: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
+  gem 'activerecord-jdbc-alt-adapter', '~> 61.0', platform: :jruby, require: true
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'jdbc-mssql', platforms: :jruby, require: true
+  gem 'jdbc-sqlite3', platforms: :jruby
 end
 
-gemspec path: "../"
+gemspec path: Dir.pwd