activerecord-sqlserver-adapter 8.0.10 → 8.1.0

data/test/schema/sqlserver_specific_schema.rb

@@ -7,36 +7,36 @@ ActiveRecord::Schema.define do
 
   create_table :sst_datatypes_migration, force: true do |t|
     # Simple Rails conventions.
-    t.integer   :integer_col
-    t.bigint    :bigint_col
-    t.boolean   :boolean_col
-    t.decimal   :decimal_col
-    t.float     :float_col
-    t.string    :string_col
-    t.text      :text_col
-    t.datetime  :datetime_nil_precision_col, precision: nil
-    t.datetime  :datetime_col  # Precision defaults to 6
+    t.integer :integer_col
+    t.bigint :bigint_col
+    t.boolean :boolean_col
+    t.decimal :decimal_col
+    t.float :float_col
+    t.string :string_col
+    t.text :text_col
+    t.datetime :datetime_nil_precision_col, precision: nil
+    t.datetime :datetime_col  # Precision defaults to 6
     t.timestamp :timestamp_col # Precision defaults to 6
-    t.time      :time_col
-    t.date      :date_col
-    t.binary    :binary_col
+    t.time :time_col
+    t.date :date_col
+    t.binary :binary_col
     # Our type methods.
-    t.real           :real_col
-    t.money          :money_col
-    t.smalldatetime  :smalldatetime_col
-    t.datetime2      :datetime2_col
+    t.real :real_col
+    t.money :money_col
+    t.smalldatetime :smalldatetime_col
+    t.datetime2 :datetime2_col
     t.datetimeoffset :datetimeoffset
-    t.smallmoney     :smallmoney_col
-    t.char           :char_col
-    t.varchar        :varchar_col
-    t.text_basic     :text_basic_col
-    t.nchar          :nchar_col
-    t.ntext          :ntext_col
-    t.binary_basic   :binary_basic_col
-    t.binary_basic   :binary_basic_16_col, limit: 16
-    t.varbinary      :varbinary_col
-    t.uuid           :uuid_col
-    t.ss_timestamp   :sstimestamp_col
+    t.smallmoney :smallmoney_col
+    t.char :char_col
+    t.varchar :varchar_col
+    t.text_basic :text_basic_col
+    t.nchar :nchar_col
+    t.ntext :ntext_col
+    t.binary_basic :binary_basic_col
+    t.binary_basic :binary_basic_16_col, limit: 16
+    t.varbinary :varbinary_col
+    t.uuid :uuid_col
+    t.ss_timestamp :sstimestamp_col
     if supports_json?
       t.json :json_col
     else
@@ -48,7 +48,7 @@ ActiveRecord::Schema.define do
 
   if ENV["IN_MEMORY_OLTP"] && supports_in_memory_oltp?
     create_table "sst_memory", force: true, id: false,
-                               options: "WITH (MEMORY_OPTIMIZED = ON, DURABILITY = SCHEMA_AND_DATA)" do |t|
+      options: "WITH (MEMORY_OPTIMIZED = ON, DURABILITY = SCHEMA_AND_DATA)" do |t|
       t.primary_key_nonclustered :id
       t.string :name
       t.timestamps
@@ -63,8 +63,8 @@ ActiveRecord::Schema.define do
 
   create_table "sst_uuids", force: true, id: :uuid do |t|
     t.string :name
-    t.uuid   :other_uuid, default: "NEWID()"
-    t.uuid   :uuid_nil_default, default: nil
+    t.uuid :other_uuid, default: "NEWID()"
+    t.uuid :uuid_nil_default, default: nil
   end
 
   create_table "sst_my$strange_table", force: true do |t|
@@ -85,7 +85,7 @@ ActiveRecord::Schema.define do
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'sst_quoted-view1') DROP VIEW [sst_quoted-view1]"
   execute "CREATE VIEW [sst_quoted-view1] AS SELECT * FROM [sst_quoted-table]"
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'sst_quoted-view2') DROP VIEW [sst_quoted-view2]"
-  execute "CREATE VIEW [sst_quoted-view2] AS \n /*#{'x' * 4000}}*/ \n SELECT * FROM [sst_quoted-table]"
+  execute "CREATE VIEW [sst_quoted-view2] AS \n /*#{"x" * 4000}}*/ \n SELECT * FROM [sst_quoted-table]"
 
   create_table :sst_string_defaults, force: true do |t|
     t.column :string_with_null_default, :string, default: nil
@@ -138,21 +138,33 @@ ActiveRecord::Schema.define do
     )
   TINYITPKTABLE
 
-  execute "DROP DEFAULT [sst_getdateobject];" rescue nil
-  execute "CREATE DEFAULT [sst_getdateobject] AS getdate();" rescue nil
+  begin
+    execute "DROP DEFAULT [sst_getdateobject];"
+  rescue
+    nil
+  end
+  begin
+    execute "CREATE DEFAULT [sst_getdateobject] AS getdate();"
+  rescue
+    nil
+  end
   create_table "sst_defaultobjects", force: true do |t|
     t.string :name
-    t.date   :date
+    t.date :date
   end
   execute "sp_bindefault 'sst_getdateobject', 'sst_defaultobjects.date'"
 
-  execute "DROP PROCEDURE my_getutcdate" rescue nil
+  begin
+    execute "DROP PROCEDURE my_getutcdate"
+  rescue
+    nil
+  end
   execute <<-SQL
     CREATE PROCEDURE my_getutcdate AS
     SELECT GETUTCDATE() utcdate
   SQL
 
-  create_table 'A Table With Spaces', force: true do |t|
+  create_table "A Table With Spaces", force: true do |t|
     t.string :name
   end
 
@@ -195,7 +207,7 @@ ActiveRecord::Schema.define do
   execute <<-STRINGDEFAULTSBIGVIEW
     CREATE VIEW sst_string_defaults_big_view AS
       SELECT id, string_with_pretend_null_one as pretend_null
-      /*#{'x' * 4000}}*/
+      /*#{"x" * 4000}}*/
       FROM sst_string_defaults
   STRINGDEFAULTSBIGVIEW
 

data/test/support/coerceable_test_sqlserver.rb

@@ -20,32 +20,32 @@ module ARTest
 
         def coerce_all_tests!
           instance_methods(false).each do |method|
-            next unless method.to_s =~ /\Atest/
+            next unless method.to_s.start_with?("test")
 
             undef_method(method)
           end
-          STDOUT.puts "🙉 🙈 🙊  Undefined all tests: #{name}"
+          $stdout.puts "🙉 🙈 🙊  Undefined all tests: #{name}"
         end
 
         private
 
         def coerced_test_warning(test_to_coerce)
-          if test_to_coerce.is_a?(Regexp)
-            method = instance_methods(false).select { |m| m =~ test_to_coerce }
+          method = if test_to_coerce.is_a?(Regexp)
+            instance_methods(false).select { |m| m =~ test_to_coerce }
           else
-            method = test_to_coerce
+            test_to_coerce
           end
 
           Array(method).each do |m|
             result = if m && method_defined?(m)
-                       alias_method("original_#{test_to_coerce.inspect.tr('/\:"', '')}", m)
-                       undef_method(m)
-                     end
+              alias_method("original_#{test_to_coerce.inspect.tr('/\:"', "")}", m)
+              undef_method(m)
+            end
 
             if result.blank?
-              STDOUT.puts "🐳  Unfound coerced test: #{name}##{m}"
+              $stdout.puts "🐳  Unfound coerced test: #{name}##{m}"
             else
-              STDOUT.puts "🐵  Undefined coerced test: #{name}##{m}"
+              $stdout.puts "🐵  Undefined coerced test: #{name}##{m}"
             end
           end
         end

data/test/support/connection_reflection.rb

@@ -15,11 +15,6 @@ module ARTest
         connection.instance_variable_get :@connection_parameters
       end
 
-      def connection_tds_73
-        rc = connection.raw_connection
-        rc.respond_to?(:tds_73?) && rc.tds_73?
-      end
-
       def connection_sqlserver_azure?
         connection.sqlserver_azure?
       end

data/test/support/core_ext/backtrace_cleaner.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Need to handle `ActiveRecord` lines like they are in the source rather than in the Rails gem.
+module SQLServer
+  module BacktraceCleaner
+    extend ActiveSupport::Concern
+
+    private
+
+    def add_gem_filter
+      gems_paths = (Gem.path | [Gem.default_dir]).map { |p| Regexp.escape(p) }
+      return if gems_paths.empty?
+
+      gems_regexp = %r{\A(#{gems_paths.join("|")})/(bundler/)?gems/([^/]+)-([\w.]+)/(.*)}
+      gems_result = '\3 (\4) \5'
+
+      add_filter do |line|
+        if line.match?(/activerecord/)
+          line
+        else
+          line.sub(gems_regexp, gems_result)
+        end
+      end
+    end
+
+    def add_gem_silencer
+      add_silencer do |line|
+        ActiveSupport::BacktraceCleaner::FORMATTED_GEMS_PATTERN.match?(line) && !/activerecord/.match?(line)
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveSupport::BacktraceCleaner.prepend(SQLServer::BacktraceCleaner)
+end

data/test/support/query_assertions.rb

@@ -16,13 +16,13 @@ module ARTest
           if count
             assert_equal count, queries.size, "#{queries.size} instead of #{count} queries were executed. Queries: #{queries.join("\n\n")}"
           else
-            assert_operator queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{queries.empty? ? '' : "\nQueries:\n#{queries.join("\n")}"}"
+            assert_operator queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{"\nQueries:\n#{queries.join("\n")}" unless queries.empty?}"
           end
           result
         end
       end
 
-      def assert_queries_and_values_match(match, bound_values=[], count: nil, &block)
+      def assert_queries_and_values_match(match, bound_values = [], count: nil, &block)
         ActiveRecord::Base.lease_connection.materialize_transactions
 
         counter = ActiveRecord::Assertions::QueryAssertions::SQLCounter.new
@@ -35,9 +35,9 @@ module ARTest
           end
 
           if count
-            assert_equal count, matched_queries.size, "#{matched_queries.size} instead of #{count} queries were executed.#{count.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"}"
+            assert_equal count, matched_queries.size, "#{matched_queries.size} instead of #{count} queries were executed.#{"\nQueries:\n#{counter.log.join("\n")}" unless count.log.empty?}"
           else
-            assert_operator matched_queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{counter.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"}"
+            assert_operator matched_queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{"\nQueries:\n#{counter.log.join("\n")}" unless counter.log.empty?}"
           end
 
           result
@@ -53,7 +53,7 @@ module ARTest
         grouped_queries = [[]]
 
         queries.each do |query|
-          if query =~ /SAVE TRANSACTION \S+/
+          if /SAVE TRANSACTION \S+/.match?(query)
             grouped_queries << [query]
           else
             grouped_queries.last << query
@@ -61,7 +61,7 @@ module ARTest
         end
 
         grouped_queries.each do |group|
-          group.append "/* release savepoint placeholder for testing */" if group.first =~ /SAVE TRANSACTION \S+/
+          group.append "/* release savepoint placeholder for testing */" if /SAVE TRANSACTION \S+/.match?(group.first)
         end
 
         grouped_queries.flatten

data/test/support/rake_helpers.rb

@@ -6,11 +6,9 @@ SQLSERVER_COERCED = "test/cases/coerced_tests.rb"
 def env_ar_test_files
   return unless ENV["TEST_FILES_AR"] && !ENV["TEST_FILES_AR"].empty?
 
-  @env_ar_test_files ||= begin
-    ENV["TEST_FILES_AR"].split(",").map { |file|
-      File.join ARTest::SQLServer.root_activerecord, file.strip
-    }.sort
-  end
+  @env_ar_test_files ||= ENV["TEST_FILES_AR"].split(",").map { |file|
+    File.join ARTest::SQLServer.root_activerecord, file.strip
+  }.sort
 end
 
 def env_test_files
@@ -24,11 +22,9 @@ def sqlserver_cases
 end
 
 def ar_cases
-  @ar_cases ||= begin
-    Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb").reject {
-      |x| x.include?("/adapters/") || x.include?("/encryption/performance")
-    }.sort
-  end
+  @ar_cases ||= Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb").reject { |x|
+    x.include?("/adapters/") || x.include?("/encryption/performance")
+  }.sort
 end
 
 def test_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.10
+  version: 8.1.0
 platform: ruby
 authors:
 - Ken Collins
@@ -22,28 +22,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: ActiveRecord SQL Server Adapter. SQL Server 2012 and upward.
 email:
 - ken@metaskills.net
@@ -184,6 +184,7 @@ files:
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
 - test/cases/view_test_sqlserver.rb
+- test/cases/virtual_column_test_sqlserver.rb
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
@@ -226,6 +227,7 @@ files:
 - test/schema/sqlserver_specific_schema.rb
 - test/support/coerceable_test_sqlserver.rb
 - test/support/connection_reflection.rb
+- test/support/core_ext/backtrace_cleaner.rb
 - test/support/core_ext/query_cache.rb
 - test/support/load_schema_sqlserver.rb
 - test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic.dump
@@ -243,8 +245,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.10/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.10
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.1.0
 rdoc_options: []
 require_paths:
 - lib
@@ -262,101 +264,4 @@ requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
-test_files:
-- test/appveyor/dbsetup.ps1
-- test/appveyor/dbsetup.sql
-- test/bin/install-freetds.sh
-- test/bin/install-openssl.sh
-- test/bin/setup.sh
-- test/cases/active_schema_test_sqlserver.rb
-- test/cases/adapter_test_sqlserver.rb
-- test/cases/change_column_collation_test_sqlserver.rb
-- test/cases/change_column_index_test_sqlserver.rb
-- test/cases/change_column_null_test_sqlserver.rb
-- test/cases/coerced_tests.rb
-- test/cases/column_test_sqlserver.rb
-- test/cases/connection_test_sqlserver.rb
-- test/cases/dbconsole.rb
-- test/cases/disconnected_test_sqlserver.rb
-- test/cases/eager_load_too_many_ids_test_sqlserver.rb
-- test/cases/enum_test_sqlserver.rb
-- test/cases/execute_procedure_test_sqlserver.rb
-- test/cases/fetch_test_sqlserver.rb
-- test/cases/fully_qualified_identifier_test_sqlserver.rb
-- test/cases/helper_sqlserver.rb
-- test/cases/in_clause_test_sqlserver.rb
-- test/cases/index_test_sqlserver.rb
-- test/cases/insert_all_test_sqlserver.rb
-- test/cases/json_test_sqlserver.rb
-- test/cases/lateral_test_sqlserver.rb
-- test/cases/migration_test_sqlserver.rb
-- test/cases/optimizer_hints_test_sqlserver.rb
-- test/cases/order_test_sqlserver.rb
-- test/cases/pessimistic_locking_test_sqlserver.rb
-- test/cases/primary_keys_test_sqlserver.rb
-- test/cases/rake_test_sqlserver.rb
-- test/cases/schema_dumper_test_sqlserver.rb
-- test/cases/schema_test_sqlserver.rb
-- test/cases/showplan_test_sqlserver.rb
-- test/cases/specific_schema_test_sqlserver.rb
-- test/cases/temp_test_sqlserver.rb
-- test/cases/temporary_table_test_sqlserver.rb
-- test/cases/transaction_test_sqlserver.rb
-- test/cases/trigger_test_sqlserver.rb
-- test/cases/utils_test_sqlserver.rb
-- test/cases/uuid_test_sqlserver.rb
-- test/cases/view_test_sqlserver.rb
-- test/config.yml
-- test/debug.rb
-- test/fixtures/1px.gif
-- test/fixtures/sst_customers_view.yml
-- test/migrations/create_clients_and_change_column_collation.rb
-- test/migrations/create_clients_and_change_column_null.rb
-- test/migrations/transaction_table/1_table_will_never_be_created.rb
-- test/models/sqlserver/alien.rb
-- test/models/sqlserver/booking.rb
-- test/models/sqlserver/composite_pk.rb
-- test/models/sqlserver/customers_view.rb
-- test/models/sqlserver/datatype.rb
-- test/models/sqlserver/datatype_migration.rb
-- test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/edge_schema.rb
-- test/models/sqlserver/fk_has_fk.rb
-- test/models/sqlserver/fk_has_pk.rb
-- test/models/sqlserver/natural_pk_data.rb
-- test/models/sqlserver/natural_pk_int_data.rb
-- test/models/sqlserver/no_pk_data.rb
-- test/models/sqlserver/object_default.rb
-- test/models/sqlserver/quoted_table.rb
-- test/models/sqlserver/quoted_view_1.rb
-- test/models/sqlserver/quoted_view_2.rb
-- test/models/sqlserver/recurring_task.rb
-- test/models/sqlserver/sst_memory.rb
-- test/models/sqlserver/sst_string_collation.rb
-- test/models/sqlserver/string_default.rb
-- test/models/sqlserver/string_defaults_big_view.rb
-- test/models/sqlserver/string_defaults_view.rb
-- test/models/sqlserver/table_with_spaces.rb
-- test/models/sqlserver/tinyint_pk.rb
-- test/models/sqlserver/trigger.rb
-- test/models/sqlserver/trigger_history.rb
-- test/models/sqlserver/upper.rb
-- test/models/sqlserver/uppered.rb
-- test/models/sqlserver/uuid.rb
-- test/schema/datatypes/2012.sql
-- test/schema/enable-in-memory-oltp.sql
-- test/schema/sqlserver_specific_schema.rb
-- test/support/coerceable_test_sqlserver.rb
-- test/support/connection_reflection.rb
-- test/support/core_ext/query_cache.rb
-- test/support/load_schema_sqlserver.rb
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic.dump
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic_associations.dump
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic.dump
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic_associations.dump
-- test/support/minitest_sqlserver.rb
-- test/support/paths_sqlserver.rb
-- test/support/query_assertions.rb
-- test/support/rake_helpers.rb
-- test/support/table_definition_sqlserver.rb
-- test/support/test_in_memory_oltp.rb
+test_files: []