activerecord-sqlserver-adapter 6.0.1 → 6.1.1.0

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -16,7 +16,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :tinyint,           type: "integer",      limit: 1,             precision: nil,   scale: nil,  default: 42
     assert_line :bit,               type: "boolean",      limit: nil,           precision: nil,   scale: nil,  default: true
     assert_line :decimal_9_2,       type: "decimal",      limit: nil,           precision: 9,     scale: 2,    default: 12345.01
-    assert_line :numeric_18_0,      type: "decimal",      limit: nil,           precision: 18,    scale: 0,    default: 191.0
+    assert_line :numeric_18_0,      type: "decimal",      limit: nil,           precision: 18,    scale: nil,  default: 191
     assert_line :numeric_36_2,      type: "decimal",      limit: nil,           precision: 36,    scale: 2,    default: 12345678901234567890.01
     assert_line :money,             type: "money",        limit: nil,           precision: 19,    scale: 4,    default: 4.2
     assert_line :smallmoney,        type: "smallmoney",   limit: nil,           precision: 10,    scale: 4,    default: 4.2
@@ -75,7 +75,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :integer_col,     type: "integer",      limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :bigint_col,      type: "bigint",       limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :boolean_col,     type: "boolean",      limit: nil,          precision: nil,  scale: nil, default: nil
-    assert_line :decimal_col,     type: "decimal",      limit: nil,          precision: 18,   scale: 0,   default: nil
+    assert_line :decimal_col,     type: "decimal",      limit: nil,          precision: 18,   scale: nil, default: nil
     assert_line :float_col,       type: "float",        limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :string_col,      type: "string",       limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :text_col,        type: "text",         limit: nil,          precision: nil,  scale: nil, default: nil
@@ -119,6 +119,15 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :json_col,          type: "text",           limit: nil,           precision: nil,   scale: nil,  default: nil
   end
 
+  it "dump column collation" do
+    generate_schema_for_table('sst_string_collation')
+
+    assert_line :string_without_collation, type: "string", limit: nil, default: nil, collation: nil
+    assert_line :string_default_collation, type: "varchar", limit: nil, default: nil, collation: nil
+    assert_line :string_with_collation, type: "varchar", limit: nil, default: nil, collation: "SQL_Latin1_General_CP1_CS_AS"
+    assert_line :varchar_with_collation, type: "varchar", limit: nil, default: nil, collation: "SQL_Latin1_General_CP1_CS_AS"
+  end
+
   # Special Cases
 
   it "honor nonstandard primary keys" do
@@ -166,13 +175,15 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
 
   def assert_line(column_name, options = {})
     line = line(column_name)
-    assert line, "Count not find line with column name: #{column_name.inspect} in schema:\n#{schema}"
+    assert line, "Could not find line with column name: #{column_name.inspect} in schema:\n#{schema}"
+
     [:type, :limit, :precision, :scale, :collation, :default].each do |key|
       next unless options.key?(key)
 
       actual   = key == :type ? line.send(:type_method) : line.send(key)
       expected = options[key]
       message  = "#{key.to_s.titleize} of #{expected.inspect} not found in:\n#{line}"
+
       if expected.nil?
         _(actual).must_be_nil message
       elsif expected.is_a?(Array)

data/test/migrations/create_clients_and_change_column_collation.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CreateClientsAndChangeColumnCollation < ActiveRecord::Migration[5.2]
+  def up
+    create_table :clients do |t|
+      t.string :name
+      t.string :code, collation: :SQL_Latin1_General_CP1_CS_AS
+
+      t.timestamps
+    end
+
+    change_column :clients, :name, :string, collation: 'SQL_Latin1_General_CP1_CS_AS'
+    change_column :clients, :code, :string, collation: 'SQL_Latin1_General_CP1_CI_AS'
+  end
+
+  def down
+    drop_table :clients
+  end
+end

data/test/models/sqlserver/composite_pk.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SSCompositePkWithoutIdentity < ActiveRecord::Base
+  self.table_name = :sst_composite_without_identity
+end
+
+class SSCompositePkWithIdentity < ActiveRecord::Base
+  self.table_name = :sst_composite_with_identity
+end

data/test/models/sqlserver/sst_string_collation.rb

@@ -0,0 +1,3 @@
+class SstStringCollation < ActiveRecord::Base
+  self.table_name = "sst_string_collation"
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -95,6 +95,13 @@ ActiveRecord::Schema.define do
     t.column :string_with_multiline_default, :string, default: "Some long default with a\nnew line."
   end
 
+  create_table :sst_string_collation, collation: :SQL_Latin1_General_CP1_CI_AS, force: true do |t|
+    t.string :string_without_collation
+    t.varchar :string_default_collation, collation: :SQL_Latin1_General_CP1_CI_AS
+    t.varchar :string_with_collation, collation: :SQL_Latin1_General_CP1_CS_AS
+    t.varchar :varchar_with_collation, collation: :SQL_Latin1_General_CP1_CS_AS
+  end
+
   create_table :sst_edge_schemas, force: true do |t|
     t.string :description
     t.column "crazy]]quote", :string
@@ -287,4 +294,22 @@ ActiveRecord::Schema.define do
       CONSTRAINT PK_UNIQUE_KEY PRIMARY KEY (id)
     );
   SQLSERVERUNIQUEKEYS
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_composite_without_identity') DROP TABLE sst_composite_without_identity"
+  execute <<-COMPOSITE_WITHOUT_IDENTITY
+    CREATE TABLE sst_composite_without_identity (
+      pk_col_one int NOT NULL,
+      pk_col_two int NOT NULL,
+      CONSTRAINT PK_sst_composite_without_identity PRIMARY KEY (pk_col_one, pk_col_two)
+    );
+  COMPOSITE_WITHOUT_IDENTITY
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_composite_with_identity') DROP TABLE sst_composite_with_identity"
+  execute <<-COMPOSITE_WITH_IDENTITY
+    CREATE TABLE sst_composite_with_identity (
+      pk_col_one int IDENTITY NOT NULL,
+      pk_col_two int NOT NULL,
+      CONSTRAINT PK_sst_composite_with_identity PRIMARY KEY (pk_col_one, pk_col_two)
+    );
+  COMPOSITE_WITH_IDENTITY
 end

data/test/support/sql_counter_sqlserver.rb

@@ -11,17 +11,19 @@ module ARTest
       end
     end
 
-    ignored_sql = [
-      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
-      /sys.columns/i,
-      /SELECT @@version/,
-      /SELECT @@TRANCOUNT/,
-      /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
-      /SELECT CAST\(.* AS .*\) AS value/,
-      /SELECT DATABASEPROPERTYEX/im
-    ]
-
-    sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
-    sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
+    # TODO: Delete the code below after all Rails 6.1 tests passing.
+    #
+    # ignored_sql = [
+    #   /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
+    #   /sys.columns/i,
+    #   /SELECT @@version/,
+    #   /SELECT @@TRANCOUNT/,
+    #   /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+    #   /SELECT CAST\(.* AS .*\) AS value/,
+    #   /SELECT DATABASEPROPERTYEX/im
+    # ]
+    #
+    # sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
+    # sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.1.0
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -54,9 +54,9 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".github/issue_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile.ci
@@ -78,7 +78,6 @@ files:
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/preloader.rb
-- lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
 - lib/active_record/connection_adapters/sqlserver/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/database_tasks.rb
@@ -104,6 +103,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/type/datetime2.rb
 - lib/active_record/connection_adapters/sqlserver/type/datetimeoffset.rb
 - lib/active_record/connection_adapters/sqlserver/type/decimal.rb
+- lib/active_record/connection_adapters/sqlserver/type/decimal_without_scale.rb
 - lib/active_record/connection_adapters/sqlserver/type/float.rb
 - lib/active_record/connection_adapters/sqlserver/type/integer.rb
 - lib/active_record/connection_adapters/sqlserver/type/json.rb
@@ -143,10 +143,12 @@ files:
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
+- test/cases/change_column_collation_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/disconnected_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -154,9 +156,12 @@ files:
 - test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_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
@@ -170,9 +175,11 @@ files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- 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/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
@@ -188,6 +195,7 @@ files:
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.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
@@ -204,6 +212,8 @@ files:
 - 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_0_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb
@@ -214,8 +224,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/v6.0.1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v6.0.1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v6.1.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v6.1.1.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -231,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
@@ -242,10 +252,12 @@ test_files:
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
+- test/cases/change_column_collation_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/disconnected_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -253,9 +265,12 @@ test_files:
 - test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_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
@@ -269,9 +284,11 @@ test_files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- 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/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
@@ -287,6 +304,7 @@ test_files:
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.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
@@ -303,6 +321,8 @@ test_files:
 - 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_0_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb

data/.travis.yml

@@ -1,23 +0,0 @@
-sudo: required
-cache: bundler
-services:
-  - docker
-env:
-  global:
-    - COMPOSE_FILE: docker-compose.ci.yml
-before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - sudo curl -L "https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-  - sudo chmod +x /usr/local/bin/docker-compose
-install:
-  - docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION
-script:
-  - docker-compose run ci
-matrix:
-  include:
-    - 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

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-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.
-          # This patch can be removed when adapter supports Rails version greater than 6.0.2.2
-          def table_name_matches?(from)
-            table_name = Regexp.escape(table.name)
-            quoted_table_name = Regexp.escape(connection.quote_table_name(table.name))
-            /(?:\A|(?<!FROM)\s)(?:\b#{table_name}\b|#{quoted_table_name})(?!\.)/i.match?(from.to_s)
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::QueryMethods)
-end