Merge branch 'master' into master

Author: wpolicarpo

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/issue_template.md

@@ -0,0 +1,23 @@
+## Issue
+<!-- Give a brief summary of the issue. -->
+
+## Expected behavior
+<!-- Tell us what should happen -->
+
+## Actual behavior
+<!-- Tell us what happens instead -->
+
+## How to reproduce
+<!-- See https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/wiki/How-to-report-a-bug -->
+
+## Details
+
+- **Rails version**: `x.x.x`
+- **SQL Server adapter version**: `x.x.x`
+- **TinyTDS version**: `x.x.x`
+- **FreeTDS details**:
+
+  ```
+  run `tsql -C` and paste here the output.
+  ```
+

.gitignore

@@ -3,6 +3,7 @@ debug.log
 .DS_Store
 pkg/
 doc/
+db/
 *.gem
 .bundle
 Gemfile.lock

.rubocop.yml

@@ -0,0 +1,8 @@
+AllCops:
+  TargetRubyVersion: 2.5
+
+Layout/LineLength:
+  Max: 120
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

.travis.yml

@@ -15,11 +15,9 @@ script:
   - docker-compose run ci
 matrix:
   include:
-    - name: 2.3.8
-      env: TARGET_VERSION=2.3.8
-    - name: 2.4.6
-      env: TARGET_VERSION=2.4.6
-    - name: 2.5.5
-      env: TARGET_VERSION=2.5.5
-    - name: 2.6.3
-      env: TARGET_VERSION=2.6.3
+    - name: 2.5.8
+      env: TARGET_VERSION=2.5.8
+    - name: 2.6.6
+      env: TARGET_VERSION=2.6.6
+    - name: 2.7.1
+      env: TARGET_VERSION=2.7.1

CHANGELOG.md

@@ -1,25 +1,42 @@
-## v5.2.0
-
-- #686 sql_for_insert set table name in case when pk is not nil
-
-## v5.2.0.rc2
+## v6.0.0.rc2 (unreleased)
 
 #### Fixed
 
-- #681 change_column_null should not clear other column attributes. Fixes #582.
-- #684 Fix explain with array conditions. Fixes #673.
+- [#826](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/826) Rubocop: Enable Style/StringLiterals cop
+- [#827](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/827) Rubocop: Enable Layout/EmptyLinesAroundClassBody cop
+- [#828](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/828) Rubocop: Enable Layout/EmptyLines cop
+- [#829](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/829) Rubocop: Enable Layout/Layout/EmptyLinesAround* cops
+- [#830](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/830) Rubocop: Enable Layout/IndentationWidth and Layout/TrailingWhitespace cops
+- [#831](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/831) Rubocop: Enable Spacing cops
+- [#832](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/832) Rubocop: Enable Bundler cops
 
-## v5.2.0.rc1
+## v6.0.0.rc1
 
 #### Fixed
 
-- #638 Don't disable referential integrity for the same table twice.
-- #646 Make String equality check work for Type::Data values. Fixes #645.
-- #671 Fix tinyint columns schema migration. Fixes #670.
+- [#690](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/690) Rails 6 support
+- [#805](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/805) Rails 6: Fix database tasks tests for SQL Server
+- [#807](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/807) Rails 6: Skip binary fixtures test on Windows
+- [#809](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/809) Rails 6: Coerce reaper test using fork
+- [#810](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/810) Rails 6: Fix randomly failing tests due to schema load
+- [#812](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/812) Rails 6: Coerce ReloadModelsTest test on Windows
+- [#818](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/818) Handle false return by TinyTDS if connection fails and fixed CI
+- [#819](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/819) Fix Ruby 2.7 kwargs warnings
+- [#825](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/825) Adjust error message when connection is dead
 
 #### Changed
 
-- #642 Added with (nolock) hint to information_schema.views.
+- [#716](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/716) Translate the connection timed out error
+- [#763](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/763) Refactor columns introspection query to make it faster
+- [#783](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/783) Update test matrix
+- [#820](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/820) Enable frozen strings for tests
+- [#821](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/821) Enable frozen strings - part 1
+- [#822](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/822) Enable frozen strings - part 2
+- [#823](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/823) Enable frozen strings - final
+- [#824](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/824) Tidy up Gemfile
+
+#### Added
 
+- [#726](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/726) How to Develop ActiveRecord SQL Server Adapter with Pre-Installed MS SQL
 
-Please check [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/5-1-stable/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/5-2-stable/CHANGELOG.md) for previous changes.

Dockerfile renamed to Dockerfile.ci

@@ -1,6 +1,6 @@
 ARG TARGET_VERSION=2.6.3
 
-FROM wpolicarpo/activerecord-sqlserver-adapter:${TARGET_VERSION}
+FROM railssqlserver/activerecord-sqlserver-adapter:${TARGET_VERSION}
 
 ENV WORKDIR /activerecord-sqlserver-adapter
 

Gemfile

@@ -1,62 +1,69 @@
-require 'openssl'
-source 'https://rubygems.org'
-gemspec
+# frozen_string_literal: true
 
-gem 'sqlite3', '~> 1.3.6'
-gem 'bcrypt'
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+source "https://rubygems.org"
 
-if RbConfig::CONFIG["host_os"] =~ /darwin/
-  gem 'terminal-notifier-guard'
-end
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec
 
-if ENV['RAILS_SOURCE']
-  gemspec path: ENV['RAILS_SOURCE']
+gem "bcrypt"
+gem "pg",      ">= 0.18.0"
+gem "sqlite3", "~> 1.4"
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+if ENV["RAILS_SOURCE"]
+  gemspec path: ENV["RAILS_SOURCE"]
 else
-  # Need to get rails source beacause the gem doesn't include tests
-  version = ENV['RAILS_VERSION'] || begin
-    require 'net/http'
-    require 'yaml'
-    spec = eval(File.read('activerecord-sqlserver-adapter.gemspec'))
-    ver = spec.dependencies.detect{ |d|d.name == 'activerecord' }.requirement.requirements.first.last.version
-    major, minor, tiny, pre = ver.split('.')
-    if !pre
-      uri = URI.parse "https://rubygems.org/api/v1/versions/activerecord.yaml"
+  # Need to get rails source because the gem doesn't include tests
+  version = ENV["RAILS_VERSION"] || begin
+    require "openssl"
+    require "net/http"
+    require "yaml"
+
+    spec = eval(File.read("activerecord-sqlserver-adapter.gemspec"))
+    ver  = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
+    major, minor, tiny, pre = ver.split(".")
+
+    if pre
+      ver
+    else
+      uri  = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      YAML.load(http.request(Net::HTTP::Get.new(uri.request_uri)).body).select do |data|
-        a, b, c = data['number'].split('.')
-        !data['prerelease'] && major == a && (minor.nil? || minor == b)
-      end.first['number']
-    else
-      ver
+      YAML.load(http.request(Net::HTTP::Get.new(uri.request_uri)).body).find do |data|
+        a, b, c = data["number"].split(".")
+        !data["prerelease"] && major == a && (minor.nil? || minor == b)
+      end["number"]
     end
   end
-  gem 'rails', git: "git://github.com/rails/rails.git", tag: "v#{version}"
-end
-
-if ENV['AREL']
-  gem 'arel', path: ENV['AREL']
+  gem "rails", github: "rails/rails", tag: "v#{version}"
 end
 
+# rubocop:disable Bundler/DuplicatedGem
 group :tinytds do
-  if ENV['TINYTDS_SOURCE']
-    gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
-  elsif ENV['TINYTDS_VERSION']
-    gem 'tiny_tds', ENV['TINYTDS_VERSION']
+  if ENV["TINYTDS_SOURCE"]
+    gem "tiny_tds", path: ENV["TINYTDS_SOURCE"]
+  elsif ENV["TINYTDS_VERSION"]
+    gem "tiny_tds", ENV["TINYTDS_VERSION"]
   else
-    gem 'tiny_tds'
+    gem "tiny_tds"
   end
 end
+# rubocop:enable Bundler/DuplicatedGem
 
 group :development do
-  gem 'byebug'
-  gem 'mocha'
-  gem 'minitest-spec-rails'
+  gem "minitest-spec-rails"
+  gem "mocha"
+  gem "pry-byebug", platform: [:mri, :mingw, :x64_mingw]
 end
 
 group :guard do
-  gem 'guard'
-  gem 'guard-minitest'
+  gem "guard"
+  gem "guard-minitest"
+  gem "terminal-notifier-guard" if RbConfig::CONFIG["host_os"] =~ /darwin/
+end
+
+group :rubocop do
+  gem "rubocop", require: false
 end

Guardfile

@@ -1,29 +1,30 @@
+# frozen_string_literal: true
 
-require_relative 'test/support/paths_sqlserver'
+require_relative "test/support/paths_sqlserver"
 
 clearing :on
 notification :terminal_notifier if defined?(TerminalNotifier)
 ignore %r{debug\.log}
 
-ar_lib  = File.join ARTest::SQLServer.root_activerecord, 'lib'
-ar_test = File.join ARTest::SQLServer.root_activerecord, 'test'
+ar_lib  = File.join ARTest::SQLServer.root_activerecord, "lib"
+ar_test = File.join ARTest::SQLServer.root_activerecord, "test"
 
 guard :minitest, {
   all_on_start: false,
   autorun: false,
-  include: ['lib', 'test', ar_lib, ar_test],
-  test_folders: ['test'],
+  include: ["lib", "test", ar_lib, ar_test],
+  test_folders: ["test"],
   test_file_patterns: ["*_test.rb", "*_test_sqlserver.rb"]
 } do
   # Our project watchers.
-  if ENV['TEST_FILES']
-    ENV['TEST_FILES'].split(',').map(&:strip).each do |file|
+  if ENV["TEST_FILES"]
+    ENV["TEST_FILES"].split(",").map(&:strip).each do |file|
       watch(%r{.*}) { file }
     end
   else
     watch(%r{^test/cases/\w+_test_sqlserver\.rb$})
     watch(%r{^test/cases/coerced_tests\.rb$}) { "test/cases/coerced_tests.rb" }
     watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$})  { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
-    watch(%r{^test/cases/helper_sqlserver\.rb$}) { 'test' }
+    watch(%r{^test/cases/helper_sqlserver\.rb$}) { "test" }
   end
 end

README.md

@@ -3,22 +3,21 @@
 * [![TravisCI](https://travis-ci.org/rails-sqlserver/activerecord-sqlserver-adapter.svg?branch=master)](https://travis-ci.org/rails-sqlserver/activerecord-sqlserver-adapter) - TravisCI
 * [![Build Status](https://ci.appveyor.com/api/projects/status/mtgbx8f57vr7k2qa/branch/master?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/activerecord-sqlserver-adapter/branch/master) - Appveyor
 * [![Gem Version](http://img.shields.io/gem/v/activerecord-sqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-sqlserver-adapter) - Gem Version
-* [![Dependency Status](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter/badge)](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter) - Dependency Status
 * [![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 The Adapter
 
-The SQL Server adapter for ActiveRecord v5.2 using SQL Server 2012 or higher.
+The SQL Server adapter for ActiveRecord v6.0 using SQL Server 2012 or higher.
 
-Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 5.1.x version of the adapter is only for the latest 5.1 version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
+Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 5.2.x version of the adapter is only for the latest 5.2 version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
 
 #### Native Data Type Support
 
 We support every data type supported by FreeTDS. All simplified Rails types in migrations will coorespond to a matching SQL Server national (unicode) data type. Always check the `initialize_native_database_types` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver/schema_statements.rb) for an updated list.
 
-The following types (date, datetime2, datetimeoffset, time) all require TDS version 7.3 with TinyTDS. We recommend using FreeTDS 1.0 or higher which default to using `TDSVER` to "7.3". The adapter also sets TinyTDS's `tds_version` to this as well if non is specified.
+The following types (`date`, `datetime2`, `datetimeoffset`, `time`) all require TDS version `7.3` with TinyTDS. We recommend using FreeTDS 1.0 or higher which default to using `TDSVER` to `7.3`. The adapter also sets TinyTDS's `tds_version` to this as well if non is specified.
 
-The Rails v5 adapter supports ActiveRecord's `datetime_with_precision` setting. This means that passing `:precision` to a datetime column is supported. Using a pecision with the `:datetime` type will signal the adapter to use the `datetime2` type under the hood.
+The Rails v5 adapter supports ActiveRecord's `datetime_with_precision` setting. This means that passing `:precision` to a datetime column is supported. Using a precision with the `:datetime` type will signal the adapter to use the `datetime2` type under the hood.
 
 
 #### Identity Inserts with Triggers
@@ -81,9 +80,9 @@ end
 Every class that sub classes ActiveRecord::Base will now have an execute_procedure class method to use. This method takes the name of the stored procedure which can be a string or symbol and any number of variables to pass to the procedure. Arguments will automatically be quoted per the connection's standards as normal. For example:
 
 ```ruby
-Account.execute_procedure :update_totals, 'admin', nil, true
+Account.execute_procedure(:update_totals, 'admin', nil, true
 # Or with named parameters.
-Account.execute_procedure :update_totals, named: 'params'
+Account.execute_procedure(:update_totals, named: 'params')
 ```
 
 #### Explain Support (SHOWPLAN)
@@ -120,7 +119,7 @@ ActiveRecord::ConnectionAdapters::SQLServerAdapter.showplan_option = 'SHOWPLAN_X
 
 ## Installation
 
-The adapter has no strict gem dependencies outside of ActiveRecord. You will have to pick a connection mode, the default is dblib which uses the TinyTDS gem. Just bundle the gem and the adapter will use it.
+The adapter has no strict gem dependencies outside of `ActiveRecord`. You will have to pick a connection mode, the default is dblib which uses the `TinyTDS` gem. Just bundle the gem and the adapter will use it.
 
 ```ruby
 gem 'tiny_tds'
@@ -140,30 +139,9 @@ If you would like to contribute a feature or bugfix, thanks! To make sure your f
 
 Many many people have contributed. If you do not see your name here and it should be let us know. Also, many thanks go out to those that have pledged financial contributions.
 
-
-## Contributors
-
-Up-to-date list of contributors: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
-
-* metaskills (Ken Collins)
-* Annaswims (Annaswims)
-* wbond (Will Bond)
-* Thirdshift (Garrett Hart)
-* h-lame (Murray Steele)
-* vegantech
-* cjheath (Clifford Heath)
-* fryguy (Jason Frey)
-* jrafanie (Joe Rafaniello)
-* nerdrew (Andrew Ryan)
-* snowblink (Jonathan Lim)
-* koppen (Jakob Skjerning)
-* ebryn (Erik Bryn)
-* adzap (Adam Meehan)
-* neomindryan (Ryan Findley)
-* jeremydurham (Jeremy Durham)
-
+You can see an up-to-date list of contributors here: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
 
 ## License
 
-Copyright © 2008-2017. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Copyright © 2008-2020. It is free software, and may be redistributed under the terms specified in the [MIT-LICENSE](MIT-LICENSE) file.