activerecord-sqlserver-adapter 5.1.6 → 5.2.0.rc1

data/test/cases/column_test_sqlserver.rb

@@ -798,6 +798,12 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       obj.save!
     end
 
+    it 'does not mark object as changed after save' do
+      obj.save!
+      obj.attributes
+      obj.changed?.must_equal false
+    end
+
   end
 
 end

data/test/cases/helper_sqlserver.rb

@@ -2,6 +2,7 @@ require 'support/paths_sqlserver'
 require 'bundler/setup'
 Bundler.require :default, :development
 require 'pry'
+require 'support/core_ext/query_cache'
 require 'support/minitest_sqlserver'
 require 'support/test_in_memory_oltp'
 require 'cases/helper'
@@ -9,7 +10,7 @@ require 'support/load_schema_sqlserver'
 require 'support/coerceable_test_sqlserver'
 require 'support/sql_counter_sqlserver'
 require 'support/connection_reflection'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase

data/test/cases/migration_test_sqlserver.rb

@@ -20,7 +20,7 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
     it 'not create a tables if error in migrations' do
       begin
         migrations_dir = File.join ARTest::SQLServer.migrations_root, 'transaction_table'
-        quietly { ActiveRecord::Migrator.up(migrations_dir) }
+        quietly { ActiveRecord::MigrationContext.new(migrations_dir).up }
       rescue Exception => e
         assert_match %r|this and all later migrations canceled|, e.message
       end
@@ -41,6 +41,8 @@ class MigrationTestSQLServer < ActiveRecord::TestCase
       lock_version_column = Person.columns_hash['lock_version']
       assert_equal :string, lock_version_column.type
       assert lock_version_column.default.nil?
+      assert_nothing_raised { connection.change_column 'people', 'lock_version', :integer }
+      Person.reset_column_information
     end
 
     it 'not drop the default contraint if just renaming' do

data/test/cases/order_test_sqlserver.rb

@@ -44,13 +44,13 @@ class OrderTestSQLServer < ActiveRecord::TestCase
   it 'support quoted column' do
     order = "[title]"
     post1 = Post.create title: 'AAA Post', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
+    assert_equal post1, Post.order(Arel.sql(order)).first
   end
 
   it 'support quoted table and column' do
     order = "[posts].[title]"
     post1 = Post.create title: 'AAA Post', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
+    assert_equal post1, Post.order(Arel.sql(order)).first
   end
 
   it 'support primary: column, secondary: column' do
@@ -73,74 +73,74 @@ class OrderTestSQLServer < ActiveRecord::TestCase
     order = "(CASE WHEN [title] LIKE N'ZZZ%' THEN title ELSE '' END) DESC, body"
     post1 = Post.create title: 'ZZZ Post', body: 'Test cased orders.'
     post2 = Post.create title: 'ZZZ Post', body: 'ZZZ Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support primary: quoted table and column, secondary: case expresion' do
     order = "[posts].[body] DESC, (CASE WHEN [title] LIKE N'ZZZ%' THEN title ELSE '' END) DESC"
     post1 = Post.create title: 'ZZZ Post', body: 'ZZZ Test cased orders.'
     post2 = Post.create title: 'ZZY Post', body: 'ZZZ Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support inline function' do
     order = "LEN(title)"
     post1 = Post.create title: 'A', body: 'AAA Test cased orders.'
-    assert_equal post1, Post.order(order).first
+    assert_equal post1, Post.order(Arel.sql(order)).first
   end
 
   it 'support inline function with parameters' do
     order = "SUBSTRING(title, 1, 3)"
     post1 = Post.create title: 'AAA Post', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
+    assert_equal post1, Post.order(Arel.sql(order)).first
   end
 
   it 'support inline function with parameters DESC' do
     order = "SUBSTRING(title, 1, 3) DESC"
     post1 = Post.create title: 'ZZZ Post', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
+    assert_equal post1, Post.order(Arel.sql(order)).first
   end
 
   it 'support primary: inline function, secondary: column' do
     order = "LEN(title), body"
     post1 = Post.create title: 'A', body: 'AAA Test cased orders.'
     post2 = Post.create title: 'A', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support primary: inline function, secondary: column with direction' do
     order = "LEN(title) ASC, body DESC"
     post1 = Post.create title: 'A', body: 'ZZZ Test cased orders.'
     post2 = Post.create title: 'A', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support primary: column, secondary: inline function' do
     order = "body DESC, LEN(title)"
     post1 = Post.create title: 'Post', body: 'ZZZ Test cased orders.'
     post2 = Post.create title: 'Longer Post', body: 'ZZZ Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support primary: case expression, secondary: inline function' do
     order = "CASE WHEN [title] LIKE N'ZZZ%' THEN title ELSE '' END DESC, LEN(body) ASC"
     post1 = Post.create title: 'ZZZ Post', body: 'Z'
     post2 = Post.create title: 'ZZZ Post', body: 'Test cased orders.'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
   it 'support primary: inline function, secondary: case expression' do
     order = "LEN(body), CASE WHEN [title] LIKE N'ZZZ%' THEN title ELSE '' END DESC"
     post1 = Post.create title: 'ZZZ Post', body: 'Z'
     post2 = Post.create title: 'Post', body: 'Z'
-    assert_equal post1, Post.order(order).first
-    assert_equal post2, Post.order(order).second
+    assert_equal post1, Post.order(Arel.sql(order)).first
+    assert_equal post2, Post.order(Arel.sql(order)).second
   end
 
 

data/test/schema/sqlserver_specific_schema.rb

@@ -144,12 +144,20 @@ ActiveRecord::Schema.define do
 
   # Constraints
 
-  create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :bigint, null: false) }
+  create_table(:sst_has_fks, force: true) do |t|
+    t.column(:fk_id, :bigint, null: false)
+    t.column(:fk_id2, :bigint)
+  end
+
   create_table(:sst_has_pks, force: true) { }
   execute <<-ADDFKSQL
     ALTER TABLE sst_has_fks
     ADD CONSTRAINT FK__sst_has_fks_id
     FOREIGN KEY ([fk_id])
+    REFERENCES [sst_has_pks] ([id]),
+
+    CONSTRAINT FK__sst_has_fks_id2
+    FOREIGN KEY ([fk_id2])
     REFERENCES [sst_has_pks] ([id])
   ADDFKSQL
 

data/test/support/core_ext/query_cache.rb

@@ -0,0 +1,29 @@
+require 'active_record/connection_adapters/sqlserver_adapter'
+
+module SqlIgnoredCache
+  extend ActiveSupport::Concern
+
+  IGNORED_SQL = [
+    /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
+    /SELECT @@version/,
+    /SELECT @@TRANCOUNT/,
+    /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+    /SELECT CAST\(.* AS .*\) AS value/,
+    /SELECT DATABASEPROPERTYEX/im
+  ]
+
+  # We don't want to coerce every ActiveRecord test that relies on `query_cache`
+  # just because we do more queries than the other adapters.
+  #
+  # Removing internal queries from the cache will make AR tests pass without
+  # compromising cache outside tests.
+  def cache_sql(sql, name, binds)
+    result = super
+    @query_cache.delete_if { |k, v| k =~ Regexp.union(IGNORED_SQL) }
+    result
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.prepend(SqlIgnoredCache)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.1.6
+  version: 5.2.0.rc1
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,7 @@ files:
 - BACKERS.md
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -67,6 +68,7 @@ files:
 - activerecord-sqlserver-adapter.gemspec
 - appveyor.yml
 - circle.yml
+- docker-compose.ci.yml
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb
@@ -132,7 +134,6 @@ files:
 - lib/arel_sqlserver.rb
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
-- test/bin/.keep
 - test/bin/install-freetds.sh
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
@@ -193,6 +194,7 @@ files:
 - 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/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
@@ -214,19 +216,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files:
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
-- test/bin/.keep
 - test/bin/install-freetds.sh
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
@@ -287,6 +288,7 @@ test_files:
 - 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/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb