activerecord-sqlserver-adapter 6.0.0.rc1 → 6.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e38e0db2e61f2a8afd9e9068d13927a6bf2f326b765fe60acf2251740dc1fd2c
-  data.tar.gz: 5775ca711d927153804e9f6e7bce85af0c55a312268e49b7cb70aec1b9c153ca
+  metadata.gz: ae90a6f8498d914a0cff5b47bf56fe4eacf67fa771b4f89b06fb3c97683cf6ec
+  data.tar.gz: 3bcba233d32f874bc4914886d257f32cb45b06eec83a395cec9d0d4876c59bbb
 SHA512:
-  metadata.gz: d94c57956ff87d407273cdd9fc2c1277be9238ef4c46631b3a1489875a9d1e719d7350afa5c6a7df1b7cce914c7e434ea00605c6269c1a27e881b0abf7c8fa12
-  data.tar.gz: cbacfa3df2a3005463c3d39686914fa7f2b5d517a06f177287f20f703d0b195ffdc1037b94cee70458c9fcaada7f45b8c84abc8e81cd78aff7a9ff6e3535eb19
+  metadata.gz: 8fda1468adae0fe9a8de40c33abbcd34c4364b441e3ea55724130c1a871999e2985e7c7183a03534c0361b8d89f7f150be17ca30f98a3d4ac1d36dbe956e8174
+  data.tar.gz: a893c81ab5b00204c9014aba27cab25bee3513001043e71132e00938534d7c0ca0b7ea1cd1b8b10b347c97ece39e29a30ebdfbf85ed748f983b159573f0e1836

data/.gitignore

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

data/.rubocop.yml

@@ -0,0 +1,29 @@
+AllCops:
+  TargetRubyVersion: 2.5
+
+Layout/LineLength:
+  Max: 120
+
+Naming/AccessorMethodName:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - lib/activerecord-sqlserver-adapter.rb
+
+Naming/MethodName:
+  IgnoredPatterns:
+    - visit_.*
+    - primary_Key_From_Table
+    - table_From_Statement
+    - distinct_One_As_One_Is_So_Not_Fetch
+    - make_Fetch_Possible_And_Deterministic
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/PredicateName:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v6.0.0.rc2
+
+#### Fixed
+
+- [#639](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/639) Primary key should be lowercase if schema forced to lowercase
+- [#720](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/720) quoted_date doesn't work for Type::DateTime
+
+#### Changed
+
+- [#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
+- [#833](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/833) Rubocop: Enable Layout/* cops
+- [#834](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/834) Rubocop: Enable Lint/UselessAssignment cop
+- [#835](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/835) Rubocop: Configure Naming cops
+
 ## v6.0.0.rc1
 
 #### Fixed

data/Gemfile

@@ -21,8 +21,8 @@ else
     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(".")
+    ver  = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
+    major, minor, _tiny, pre = ver.split(".")
 
     if pre
       ver
@@ -32,7 +32,7 @@ else
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       YAML.load(http.request(Net::HTTP::Get.new(uri.request_uri)).body).find do |data|
-        a, b, c = data["number"].split(".")
+        a, b, = data["number"].split(".")
         !data["prerelease"] && major == a && (minor.nil? || minor == b)
       end["number"]
     end
@@ -40,6 +40,7 @@ else
   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"]
@@ -49,11 +50,12 @@ group :tinytds do
     gem "tiny_tds"
   end
 end
+# rubocop:enable Bundler/DuplicatedGem
 
 group :development do
-  gem "pry-byebug", platform: [:mri, :mingw, :x64_mingw]
-  gem "mocha"
   gem "minitest-spec-rails"
+  gem "mocha"
+  gem "pry-byebug", platform: [:mri, :mingw, :x64_mingw]
 end
 
 group :guard do
@@ -61,3 +63,7 @@ group :guard do
   gem "guard-minitest"
   gem "terminal-notifier-guard" if RbConfig::CONFIG["host_os"] =~ /darwin/
 end
+
+group :rubocop do
+  gem "rubocop", require: false
+end

data/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

data/Rakefile

@@ -1,39 +1,35 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require_relative 'test/support/paths_sqlserver'
-require_relative 'test/support/rake_helpers'
+require "bundler/gem_tasks"
+require "rake/testtask"
+require_relative "test/support/paths_sqlserver"
+require_relative "test/support/rake_helpers"
 
-task test: ['test:dblib']
+task test: ["test:dblib"]
 task default: [:test]
 
 namespace :test do
-
   %w(dblib).each do |mode|
-
     Rake::TestTask.new(mode) do |t|
       t.libs = ARTest::SQLServer.test_load_paths
       t.test_files = test_files
-      t.warning = !!ENV['WARNING']
+      t.warning = !!ENV["WARNING"]
       t.verbose = false
     end
-
   end
 
-  task 'dblib:env' do
-    ENV['ARCONN'] = 'dblib'
+  task "dblib:env" do
+    ENV["ARCONN"] = "dblib"
   end
-
 end
 
-task 'test:dblib' => 'test:dblib:env'
+task "test:dblib" => "test:dblib:env"
 
 namespace :profile do
-  ['dblib'].each do |mode|
+  ["dblib"].each do |mode|
     namespace mode.to_sym do
-      Dir.glob('test/profile/*_profile_case.rb').sort.each do |test_file|
-        profile_case = File.basename(test_file).sub('_profile_case.rb', '')
+      Dir.glob("test/profile/*_profile_case.rb").sort.each do |test_file|
+        profile_case = File.basename(test_file).sub("_profile_case.rb", "")
         Rake::TestTask.new(profile_case) do |t|
           t.libs = ARTest::SQLServer.test_load_paths
           t.test_files = [test_file]

data/VERSION

@@ -1 +1 @@
-6.0.0.rc1
+6.0.0.rc2

data/activerecord-sqlserver-adapter.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.description   = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
 
   spec.metadata      = {
-    "bug_tracker_uri"   => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues",
-    "changelog_uri"     => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v#{version}/CHANGELOG.md",
-    "source_code_uri"   => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}",
+    "bug_tracker_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues",
+    "changelog_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v#{version}/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}",
   }
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb

@@ -5,11 +5,9 @@ module ActiveRecord
     module SQLServer
       module CoreExt
         module ActiveRecord
-
           extend ActiveSupport::Concern
 
           module ClassMethods
-
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
                 connection.execute_procedure(proc_name, *variables)
@@ -17,9 +15,7 @@ module ActiveRecord
                 []
               end
             end
-
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require 'active_record/attribute_methods'
+require "active_record/attribute_methods"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module AttributeMethods
-
-
           private
 
           def attributes_for_update(attribute_names)
@@ -17,7 +15,6 @@ module ActiveRecord
               column && column.respond_to?(:is_identity?) && column.is_identity?
             end
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_record/relation'
-require 'active_record/version'
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module Calculations
-
           # Same as original except we don't perform PostgreSQL hack that removes ordering.
           def calculate(operation, column_name)
             if has_include?(column_name)
@@ -17,7 +16,7 @@ module ActiveRecord
               if operation.to_s.downcase == "count"
                 unless distinct_value || distinct_select?(column_name || select_for_count)
                   relation.distinct!
-                  relation.select_values = [ klass.primary_key || table[Arel.star] ]
+                  relation.select_values = [klass.primary_key || table[Arel.star]]
                 end
               end
 

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -5,8 +5,7 @@ module ActiveRecord
     module SQLServer
       module CoreExt
         module Explain
-
-          SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '
+          SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
           SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries)
@@ -34,7 +33,6 @@ module ActiveRecord
 
             executesql
           end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_record/relation'
-require 'active_record/version'
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module FinderMethods
-
           private
 
           # Same as original except we order by values in distinct select if present.

data/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_record/relation'
-require 'active_record/version'
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module QueryMethods
-
           private
 
           # Copy of original from Rails master.

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -25,7 +25,7 @@ module ActiveRecord
           end
         end
 
-        def exec_query(sql, name = 'SQL', binds = [], prepare: false)
+        def exec_query(sql, name = "SQL", binds = [], prepare: false)
           if preventing_writes? && write_query?(sql)
             raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
           end
@@ -44,17 +44,17 @@ module ActiveRecord
         end
 
         def exec_delete(sql, name, binds)
-          sql = sql.dup << '; SELECT @@ROWCOUNT AS AffectedRows'
+          sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
           super(sql, name, binds).rows.first.first
         end
 
         def exec_update(sql, name, binds)
-          sql = sql.dup << '; SELECT @@ROWCOUNT AS AffectedRows'
+          sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
           super(sql, name, binds).rows.first.first
         end
 
         def begin_db_transaction
-          do_execute 'BEGIN TRANSACTION'
+          do_execute "BEGIN TRANSACTION"
         end
 
         def transaction_isolation_levels
@@ -71,11 +71,11 @@ module ActiveRecord
         end
 
         def commit_db_transaction
-          do_execute 'COMMIT TRANSACTION'
+          do_execute "COMMIT TRANSACTION"
         end
 
         def exec_rollback_db_transaction
-          do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
+          do_execute "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
         end
 
         include Savepoints
@@ -143,7 +143,7 @@ module ActiveRecord
           sql = +"INSERT #{insert.into}"
 
           if returning = insert.send(:insert_all).returning
-            sql << " OUTPUT " << returning.map {|column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
+            sql << " OUTPUT " << returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
           end
 
           sql << " #{insert.values_list}"
@@ -159,9 +159,9 @@ module ActiveRecord
                    variables.first.map { |k, v| "@#{k} = #{quote(v)}" }
                  else
                    variables.map { |v| quote(v) }
-                 end.join(', ')
+                 end.join(", ")
           sql = "EXEC #{proc_name} #{vars}".strip
-          name = 'Execute Procedure'
+          name = "Execute Procedure"
           log(sql, name) do
             case @connection_options[:mode]
             when :dblib
@@ -186,20 +186,22 @@ module ActiveRecord
 
         def use_database(database = nil)
           return if sqlserver_azure?
+
           name = SQLServer::Utils.extract_identifiers(database || @connection_options[:database]).quoted
           do_execute "USE #{name}" unless name.blank?
         end
 
         def user_options
           return {} if sqlserver_azure?
-          rows = select_rows('DBCC USEROPTIONS WITH NO_INFOMSGS', 'SCHEMA')
+
+          rows = select_rows("DBCC USEROPTIONS WITH NO_INFOMSGS", "SCHEMA")
           rows = rows.first if rows.size == 2 && rows.last.empty?
           rows.reduce(HashWithIndifferentAccess.new) do |values, row|
             if row.instance_of? Hash
-              set_option = row.values[0].gsub(/\s+/, '_')
+              set_option = row.values[0].gsub(/\s+/, "_")
               user_value = row.values[1]
-            elsif  row.instance_of? Array
-              set_option = row[0].gsub(/\s+/, '_')
+            elsif row.instance_of? Array
+              set_option = row[0].gsub(/\s+/, "_")
               user_value = row[1]
             end
             values[set_option] = user_value
@@ -209,9 +211,9 @@ module ActiveRecord
 
         def user_options_dateformat
           if sqlserver_azure?
-            select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'
+            select_value "SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID", "SCHEMA"
           else
-            user_options['dateformat']
+            user_options["dateformat"]
           end
         end
 
@@ -226,29 +228,28 @@ module ActiveRecord
                     WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level]
                     FROM [sys].[dm_exec_sessions]
                     WHERE [session_id] = @@SPID).squish
-            select_value sql, 'SCHEMA'
+            select_value sql, "SCHEMA"
           else
-            user_options['isolation_level']
+            user_options["isolation_level"]
           end
         end
 
         def user_options_language
           if sqlserver_azure?
-            select_value 'SELECT @@LANGUAGE AS [language]', 'SCHEMA'
+            select_value "SELECT @@LANGUAGE AS [language]", "SCHEMA"
           else
-            user_options['language']
+            user_options["language"]
           end
         end
 
         def newid_function
-          select_value 'SELECT NEWID()'
+          select_value "SELECT NEWID()"
         end
 
         def newsequentialid_function
-          select_value 'SELECT NEWSEQUENTIALID()'
+          select_value "SELECT NEWSEQUENTIALID()"
         end
 
-
         protected
 
         def sql_for_insert(sql, pk, binds)
@@ -263,7 +264,7 @@ module ActiveRecord
                   exclude_output_inserted = exclude_output_inserted_table_name?(table_name, sql)
 
                   if exclude_output_inserted
-                    id_sql_type = exclude_output_inserted.is_a?(TrueClass) ? 'bigint' : exclude_output_inserted
+                    id_sql_type = exclude_output_inserted.is_a?(TrueClass) ? "bigint" : exclude_output_inserted
                     <<~SQL.squish
                       DECLARE @ssaIdInsertTable table (#{quoted_pk} #{id_sql_type});
                       #{sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk} INTO @ssaIdInsertTable"}
@@ -288,7 +289,7 @@ module ActiveRecord
 
         # === SQLServer Specific (Executing) ============================ #
 
-        def do_execute(sql, name = 'SQL')
+        def do_execute(sql, name = "SQL")
           materialize_transactions
 
           log(sql, name) { raw_connection_do(sql) }
@@ -316,11 +317,12 @@ module ActiveRecord
 
         def sp_executesql_sql_type(attr)
           return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
+
           case value = attr.value_for_database
           when Numeric
-            value > 2_147_483_647 ? 'bigint'.freeze : 'int'.freeze
+            value > 2_147_483_647 ? "bigint".freeze : "int".freeze
           else
-            'nvarchar(max)'.freeze
+            "nvarchar(max)".freeze
           end
         end
 
@@ -335,14 +337,14 @@ module ActiveRecord
         end
 
         def sp_executesql_sql(sql, types, params, name)
-          if name == 'EXPLAIN'
+          if name == "EXPLAIN"
             params.each.with_index do |param, index|
               substitute_at_finder = /(@#{index})(?=(?:[^']|'[^']*')*$)/ # Finds unquoted @n values.
               sql = sql.sub substitute_at_finder, param.to_s
             end
           else
-            types = quote(types.join(', '))
-            params = params.map.with_index{ |p, i| "@#{i} = #{p}" }.join(', ') # Only p is needed, but with @i helps explain regexp.
+            types = quote(types.join(", "))
+            params = params.map.with_index { |p, i| "@#{i} = #{p}" }.join(", ") # Only p is needed, but with @i helps explain regexp.
             sql = "EXEC sp_executesql #{quote(sql)}"
             sql += ", #{types}, #{params}" unless params.empty?
           end
@@ -357,7 +359,7 @@ module ActiveRecord
             # TinyTDS returns false instead of raising an exception if connection fails.
             # Getting around this by raising an exception ourselves while this PR
             # https://github.com/rails-sqlserver/tiny_tds/pull/469 is not released.
-            raise TinyTds::Error, 'failed to execute statement' if result.is_a?(FalseClass)
+            raise TinyTds::Error, "failed to execute statement" if result.is_a?(FalseClass)
 
             result.do
           end
@@ -377,8 +379,10 @@ module ActiveRecord
 
         def exclude_output_inserted_table_name?(table_name, sql)
           return false unless exclude_output_inserted_table_names?
+
           table_name ||= get_table_name(sql)
           return false unless table_name
+
           self.class.exclude_output_inserted_table_names[table_name]
         end
 
@@ -407,7 +411,7 @@ module ActiveRecord
 
         # === SQLServer Specific (Selecting) ============================ #
 
-        def raw_select(sql, name = 'SQL', binds = [], options = {})
+        def raw_select(sql, name = "SQL", binds = [], options = {})
           log(sql, name, binds) { _raw_select(sql, options) }
         end
 
@@ -455,7 +459,6 @@ module ActiveRecord
           end
           handle
         end
-
       end
     end
   end