activerecord-sqlserver-adapter 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13700d5c59ccddfde7189f1bf0dfac4bbd276777
-  data.tar.gz: e9cafb310dfe9904c39dbf77ccc5bb86687f231a
+  metadata.gz: 378063f22d136e43bd1ed0f9bc52eb8958ccfb30
+  data.tar.gz: 97a3056adb1e8502d4e0c59ab6ce8a7367532651
 SHA512:
-  metadata.gz: 2cbb63f122e3ad2657532e7649c33728a0790f945043a12afdb078d171122970636a81dfa621485aa6a8abe7d30b9ab3892d2fef76fefd0a7ed6019fbda543dd
-  data.tar.gz: 220bc1f5a936151978885af18c38f7a25d7e684f0d7199c64d21d30922c4b33b8312e2a0db924f59d3040b0b147bbc6fa4dc564b5e1fbe6bb190daa522b322b4
+  metadata.gz: d0fa22bb008d291d299b5d3cd9b9df7d94880076f0ca6de524036551e7a7a3d145a6472d53e6709b30d67a01bc44e7c7095583dcee107f6340f05e593cdabc7a
+  data.tar.gz: e1ed20a3214446b06a99aecab587f7163cffcdb0d6036669598ece9f0c162e6e6cca213202248ecb7239ac563cf218abf1b415bebc767278aa636e5bf84d2f94

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-## v5.1.0
+## v5.1.1
 
 #### Fixed
 
+* Use `ActiveSupport.on_load` to hook into ActiveRecord Fixes #588 #598
+
+
+## v5.1.0
+
 #### Changed
 
 * The `drop_table` with force cascade option now mimics in via pure SQL for us.

data/VERSION

@@ -1 +1 @@
-5.1.0
+5.1.1

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

@@ -24,4 +24,6 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
+ActiveSupport.on_load(:active_record) do
+  include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
+end

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

@@ -22,4 +22,6 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
+ActiveSupport.on_load(:active_record) do
+  include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
+end

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

@@ -43,5 +43,7 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
-ActiveRecord::Relation.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
+ActiveSupport.on_load(:active_record) do
+  extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
+  ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain)
+end

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

@@ -1,4 +1,6 @@
-silence_warnings do
-  # Already defined in Rails
-  ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
+ActiveSupport.on_load(:active_record) do
+  silence_warnings do
+    # Already defined in Rails
+    ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
+  end
 end

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

@@ -25,7 +25,7 @@ module ActiveRecord
               do_execute "DELETE FROM #{quote_table_name(fktable)} WHERE #{quote_column_name(fkcolmn)} IN ( SELECT #{quote_column_name(pkcolmn)} FROM #{quote_table_name(pktable)} )"
             end
           end
-          if options[:if_exists] && @version_year != 2016
+          if options[:if_exists] && @version_year < 2016
             execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = #{quote(table_name)}) DROP TABLE #{quote_table_name(table_name)}"
           else
             super

data/test/bin/setup.sh

@@ -3,7 +3,7 @@
 set -x
 set -e
 
-tag=1.4
+tag=2.0
 
 docker pull metaskills/mssql-server-linux-rails:$tag
 

data/test/cases/specific_schema_test_sqlserver.rb

@@ -9,12 +9,6 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     SSTestDollarTableName.limit(20).offset(1)
   end
 
-  it 'handle dot table names' do
-    SSTestDotTableName.create! name: 'test'
-    SSTestDotTableName.limit(20).offset(1)
-    SSTestDotTableName.where(name: 'test').first.must_be :present?
-  end
-
   it 'models can use tinyint pk tables' do
     obj = SSTestTinyintPk.create! name: '1'
     ['Fixnum', 'Integer'].must_include obj.id.class.name

data/test/schema/sqlserver_specific_schema.rb

@@ -64,10 +64,6 @@ ActiveRecord::Schema.define do
     t.uuid   :uuid_nil_default, default: nil
   end
 
-  create_table '[some.Name]', force: true do |t|
-    t.varchar :name
-  end
-
   create_table 'sst_my$strange_table', force: true do |t|
     t.string :name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,6 @@ files:
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb
@@ -259,7 +258,6 @@ test_files:
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb

data/test/models/sqlserver/dot_table_name.rb

@@ -1,3 +0,0 @@
-class SSTestDotTableName < ActiveRecord::Base
-  self.table_name = '[dbo].[some.Name]'
-end