activerecord-sqlserver-adapter 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378063f22d136e43bd1ed0f9bc52eb8958ccfb30
-  data.tar.gz: 97a3056adb1e8502d4e0c59ab6ce8a7367532651
+  metadata.gz: a08a277e4b09e7e807a8e814dbe442a5f819f605
+  data.tar.gz: d05b3a0be20f6c353430b300e78a80952585582d
 SHA512:
-  metadata.gz: d0fa22bb008d291d299b5d3cd9b9df7d94880076f0ca6de524036551e7a7a3d145a6472d53e6709b30d67a01bc44e7c7095583dcee107f6340f05e593cdabc7a
-  data.tar.gz: e1ed20a3214446b06a99aecab587f7163cffcdb0d6036669598ece9f0c162e6e6cca213202248ecb7239ac563cf218abf1b415bebc767278aa636e5bf84d2f94
+  metadata.gz: d66aed80923e34eaa44a3ef7b2845dc1a6a54699a4bfaeb84caab648dee603ddbf2a78d0afd974853e757d8e6eb041426806ee41a77f15b303b7dbf81051d699
+  data.tar.gz: 2b35fd5e358b1178ef89b1bf0b7bff8f005d9f3cc585dd17a40f9bb5eb097e59151a964edbca5753df879374737bb5667ed51d63b5500482a8a6af24fb6d0da6

data/.travis.yml

@@ -4,7 +4,7 @@ services:
   - docker
 env:
   global:
-    - TINYTDS_VERSION=1.3.0
+    - TINYTDS_VERSION=2.1.0.pre4
     - ACTIVERECORD_UNITTEST_HOST=localhost
     - ACTIVERECORD_UNITTEST_DATASERVER=localhost
 rvm:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v5.1.2
+
+#### Fixed
+
+* The `fast_string_to_time` method when zone local. Fixes #609 #614 #620
+* Patched `Relation#build_count_subquery`. Fixes #613.
+* Inserts to tables with triggers using default `OUTPUT INSERTED` style. Fixes #595.
+
+
 ## v5.1.1
 
 #### Fixed

data/README.md

@@ -14,11 +14,10 @@ Both TinyTDS and the Rails SQL Server Adapter are MIT-licensed open source proje
 
 ## About The Adapter
 
-The SQL Server adapter for ActiveRecord v5.0 using SQL Server 2012 or higher.
+The SQL Server adapter for ActiveRecord v5.1 using SQL Server 2012 or higher.
 
 Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 5.0.x version of the adapter is only for the latest 5.0 version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
 
-
 #### Native Data Type Support
 
 We support every data type supported by FreeTDS. All simplified Rails types in migrations will coorespond to a matching SQL Server national (unicode) data type. Always check the `initialize_native_database_types` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver/schema_statements.rb#L243) for an updated list.
@@ -28,6 +27,21 @@ The following types (date, datetime2, datetimeoffset, time) all require TDS vers
 The Rails v5 adapter supports ActiveRecord's `datetime_with_precision` setting. This means that passing `:precision` to a datetime column is supported. Using a pecision with the `:datetime` type will signal the adapter to use the `datetime2` type under the hood.
 
 
+#### Identity Inserts with Triggers
+
+The adapter uses `OUTPUT INSERTED` so that we can select any data type key, for example UUID tables. However, this poses a problem with tables that use triggers. The solution requires that we use a more complex insert statement which uses a temporary table to select the inserted identity. To use this format you must declare your table exempt from the simple output inserted style with the table name into a concurrent hash. Optionally, you can set the data type of the table's primary key to return.
+
+```ruby
+adapter = ActiveRecord::ConnectionAdapters::SQLServerAdapter
+
+# Will assume `bigint` as the id key temp table type.
+adapter.exclude_output_inserted_table_names['my_table_name'] = true
+
+# Explicitly set the data type for the temporary key table.
+adapter.exclude_output_inserted_table_names['my_uuid_table_name'] = 'uniqueidentifier'
+```
+
+
 #### Force Schema To Lowercase
 
 Although it is not necessary, the Ruby convention is to use lowercase method names. If your database schema is in upper or mixed case, we can force all table and column names during the schema reflection process to be lowercase. Add this to your config/initializers file for the adapter.

data/VERSION

@@ -1 +1 @@
-5.1.1
+5.1.2

data/appveyor.yml

@@ -2,7 +2,7 @@ init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TINYTDS_VERSION=1.3.0
+  - SET TINYTDS_VERSION=2.1.0.pre4
 clone_depth: 5
 skip_tags: true
 matrix:

data/circle.yml

@@ -6,7 +6,7 @@ general:
 machine:
   environment:
     PATH: /opt/local/bin:${PATH}
-    TINYTDS_VERSION: 1.3.0
+    TINYTDS_VERSION: 2.1.0.pre4
     ACTIVERECORD_UNITTEST_HOST: localhost
     ACTIVERECORD_UNITTEST_DATASERVER: localhost
   services:

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

@@ -0,0 +1,39 @@
+require 'active_record/relation'
+require 'active_record/version'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module Calculations
+          private
+
+          def build_count_subquery(relation, column_name, distinct)
+            relation.select_values = [
+              if column_name == :all
+                distinct ? table[Arel.star] : Arel.sql(FinderMethods::ONE_AS_ONE)
+              else
+                column_alias = Arel.sql("count_column")
+                aggregate_column(column_name).as(column_alias)
+              end
+            ]
+
+            subquery = relation.arel.as(Arel.sql("subquery_for_count"))
+            select_value = operation_over_aggregate_column(column_alias || Arel.star, "count", false)
+
+            Arel::SelectManager.new(subquery).project(select_value)
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  if ActiveRecord::VERSION::MAJOR == 5 &&
+     ActiveRecord::VERSION::MINOR == 1 &&
+     ActiveRecord::VERSION::TINY >= 4
+    mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Calculations
+    ActiveRecord::Relation.prepend(mod)
+  end
+end

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

@@ -192,9 +192,19 @@ module ActiveRecord
             table_name = query_requires_identity_insert?(sql)
             pk = primary_key(table_name)
           end
-          sql = if pk && self.class.use_output_inserted && !database_prefix_remote_server?
+          sql = if pk && use_output_inserted? && !database_prefix_remote_server?
                   quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
-                  sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
+                  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
+                    <<-SQL.strip_heredoc
+                      DECLARE @ssaIdInsertTable table (#{quoted_pk} #{id_sql_type});
+                      #{sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk} INTO @ssaIdInsertTable"}
+                      SELECT CAST(#{quoted_pk} AS #{id_sql_type}) FROM @ssaIdInsertTable
+                    SQL
+                  else
+                    sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
+                  end
                 else
                   "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
                 end
@@ -279,6 +289,21 @@ module ActiveRecord
 
         # === SQLServer Specific (Identity Inserts) ===================== #
 
+        def use_output_inserted?
+          self.class.use_output_inserted
+        end
+
+        def exclude_output_inserted_table_names?
+          !self.class.exclude_output_inserted_table_names.empty?
+        end
+
+        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
+
         def exec_insert_requires_identity?(sql, pk, binds)
           query_requires_identity_insert?(sql) if pk && binds.map(&:name).include?(pk)
         end
@@ -287,7 +312,8 @@ module ActiveRecord
           if insert_sql?(sql)
             table_name = get_table_name(sql)
             id_column = identity_columns(table_name).first
-            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
+            # id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
+            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? table_name : false
           else
             false
           end

data/lib/active_record/connection_adapters/sqlserver/type/datetime.rb

@@ -35,7 +35,9 @@ module ActiveRecord
           private
 
           def fast_string_to_time(string)
-            fast_string_to_time_zone.strptime(string, fast_string_to_time_format).time
+            time = ActiveSupport::TimeZone['UTC'].strptime(string, fast_string_to_time_format)
+            new_time(time.year, time.month, time.day, time.hour,
+                     time.min, time.sec, Rational(time.nsec, 1_000))
           rescue ArgumentError
             super
           end
@@ -43,11 +45,6 @@ module ActiveRecord
           def fast_string_to_time_format
             "#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N".freeze
           end
-
-          def fast_string_to_time_zone
-            ::Time.zone || ActiveSupport::TimeZone['UTC']
-          end
-
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -3,6 +3,7 @@ require 'active_record'
 require 'arel_sqlserver'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
+require 'active_record/connection_adapters/sqlserver/core_ext/calculations'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain_subscriber'
 require 'active_record/connection_adapters/sqlserver/core_ext/attribute_methods'
@@ -44,11 +45,13 @@ module ActiveRecord
 
       cattr_accessor :cs_equality_operator, instance_accessor: false
       cattr_accessor :use_output_inserted, instance_accessor: false
+      cattr_accessor :exclude_output_inserted_table_names, instance_accessor: false
       cattr_accessor :showplan_option, instance_accessor: false
       cattr_accessor :lowercase_schema_reflection
 
       self.cs_equality_operator = 'COLLATE Latin1_General_CS_AS_WS'
       self.use_output_inserted = true
+      self.exclude_output_inserted_table_names = Concurrent::Map.new { false }
 
       def initialize(connection, logger = nil, config = {})
         super(connection, logger, config)

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -50,7 +50,7 @@ module ActiveRecord
 
       def structure_dump(filename, extra_flags)
         command = [
-          "defncopy",
+          "defncopy-ttds",
           "-S #{Shellwords.escape(configuration['host'])}",
           "-D #{Shellwords.escape(configuration['database'])}",
           "-U #{Shellwords.escape(configuration['username'])}",

data/test/cases/adapter_test_sqlserver.rb

@@ -140,12 +140,12 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column' do
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_sp)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted_sp)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered_sp)
     end
 
     it 'return false to #query_requires_identity_insert? for normal SQL' do

data/test/cases/coerced_tests.rb

@@ -90,6 +90,28 @@ class BasicsTest < ActiveRecord::TestCase
   # Caused in Rails v4.2.5 by adding `firm_id` column in this http://git.io/vBfMs
   # commit. Trust Rails has this covered.
   coerce_tests! :test_find_keeps_multiple_group_values
+
+  def test_update_date_time_attributes
+    Time.use_zone("Eastern Time (US & Canada)") do
+      topic = Topic.find(1)
+      time = Time.zone.parse("2017-07-17 10:56")
+      topic.update_attributes!(written_on: time)
+      assert_equal(time, topic.written_on)
+    end
+  end
+
+  def test_update_date_time_attributes_with_default_timezone_local
+    with_env_tz 'America/New_York' do
+      with_timezone_config default: :local do
+        Time.use_zone("Eastern Time (US & Canada)") do
+          topic = Topic.find(1)
+          time = Time.zone.parse("2017-07-17 10:56")
+          topic.update_attributes!(written_on: time)
+          assert_equal(time, topic.written_on)
+        end
+      end
+    end
+  end
 end
 
 

data/test/cases/trigger_test_sqlserver.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+require 'cases/helper_sqlserver'
+
+class SQLServerTriggerTest < ActiveRecord::TestCase
+  after  { exclude_output_inserted_table_names.clear }
+
+  let(:exclude_output_inserted_table_names) do
+    ActiveRecord::ConnectionAdapters::SQLServerAdapter.exclude_output_inserted_table_names
+  end
+
+  it 'can insert into a table with output inserted - with a true setting for table name' do
+    exclude_output_inserted_table_names['sst_table_with_trigger'] = true
+    assert SSTestTriggerHistory.all.empty?
+    obj = SSTestTrigger.create! event_name: 'test trigger'
+    ['Fixnum', 'Integer'].must_include obj.id.class.name
+    obj.event_name.must_equal 'test trigger'
+    obj.id.must_be :present?
+    obj.id.to_s.must_equal SSTestTriggerHistory.first.id_source
+  end
+
+  it 'can insert into a table with output inserted - with a uniqueidentifier value' do
+    exclude_output_inserted_table_names['sst_table_with_uuid_trigger'] = 'uniqueidentifier'
+    assert SSTestTriggerHistory.all.empty?
+    obj = SSTestTriggerUuid.create! event_name: 'test uuid trigger'
+    obj.id.class.name.must_equal 'String'
+    obj.event_name.must_equal 'test uuid trigger'
+    obj.id.must_be :present?
+    obj.id.to_s.must_equal SSTestTriggerHistory.first.id_source
+  end
+end

data/test/models/sqlserver/trigger.rb

@@ -0,0 +1,7 @@
+class SSTestTrigger < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger'
+end
+
+class SSTestTriggerUuid < ActiveRecord::Base
+  self.table_name = 'sst_table_with_uuid_trigger'
+end

data/test/models/sqlserver/trigger_history.rb

@@ -0,0 +1,3 @@
+class SSTestTriggerHistory < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger_history'
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -177,6 +177,44 @@ ActiveRecord::Schema.define do
       FROM sst_string_defaults
   STRINGDEFAULTSBIGVIEW
 
+  # Trigger
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger') DROP TABLE sst_table_with_trigger"
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger_history') DROP TABLE sst_table_with_trigger_history"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_trigger(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+    CREATE TABLE sst_table_with_trigger_history(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      id_source nvarchar(36),
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_trigger_t ON sst_table_with_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_uuid_trigger') DROP TABLE sst_table_with_uuid_trigger"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_uuid_trigger(
+      id uniqueidentifier DEFAULT NEWID() PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_uuid_trigger_t ON sst_table_with_uuid_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
   # Another schema.
 
   create_table :sst_schema_columns, force: true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,6 +70,7 @@ files:
 - circle.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
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
@@ -156,6 +157,7 @@ files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_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/config.yml
@@ -182,6 +184,8 @@ files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.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
@@ -247,6 +251,7 @@ test_files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_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/config.yml
@@ -273,6 +278,8 @@ test_files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.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
@@ -287,4 +294,3 @@ test_files:
 - test/support/rake_helpers.rb
 - test/support/sql_counter_sqlserver.rb
 - test/support/test_in_memory_oltp.rb
-has_rdoc: