activerecord-sqlserver-adapter 4.2.10 → 4.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f5cb06eb492b1fce0526281946dea07336bec9
-  data.tar.gz: 1b4d4a21a4a4ed6858572daac58016d8d5672d35
+  metadata.gz: 5645093f45bc28adecc3cc3a38fdb886f6683a9c
+  data.tar.gz: bddd84dff29484133c22f905f3c75439a68cbbe5
 SHA512:
-  metadata.gz: ae62612e1fe093da674fa74d67ee2e85a516795871fb6fa5fc281fadd2c09a5a0378a7a202caf592d6ab4babaa08545e218fe18a46a9e195805e8cf69195746b
-  data.tar.gz: 398a1381b3f0157bec451e29c45c57f4ade59291e10f3c17e95591bcf9471f743a2e96852c7509f946cd7237edf4b5ffcbfdd68b044165cf57d55f63daf602b9
+  metadata.gz: e2e9df466a158a7a1d35860e6c32c75b4e9f46774122b7cfcf8f43c1d9f770cb1a723cedf92f30ec9d06ec39501be10a018bbd0f6ffcff1257160127de7fa3f3
+  data.tar.gz: d24d8c79658031f51266734f5648af3cf5dc3e47911a245774f2a9dd32aecfbb25407703758ef707140507af7ab632dac93ccf193f9c30dd3c74543b5b6ef025

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v4.2.11
+
+#### Fixed
+
+* Undefined method `database_prefix_remote_server?' Fixes #450. Thanks @jippeholwerda
+* Document two methods for avoiding N'' quoting on char/varchar columns.
+* First run failure of `change_column` while dropping constraint. Fixes #420. Thanks @GrumpyRainbow @rkr090
+* Rounding errors w/datetime2(0) types having no fractional seconds. Fixes #465. Thanks @alawton
+
+#### Changed
+
+* Supporting escape hatch for N'' quoting. Remove `#is_utf8` string check in `#_quote` method.
+  This duplicated strings and forced encoding which was actually wasteful.
+
+
 ## v4.2.10
 
 #### Fixed

data/Gemfile

@@ -49,9 +49,13 @@ group :odbc do
 end
 
 group :development do
-  gem 'guard'
-  gem 'guard-minitest'
   gem 'mocha'
   gem 'minitest', '< 5.3.4' # PENDING: [Rails5.x] Remove test order constraint.
   gem 'minitest-spec-rails'
+  gem 'pry'
+end
+
+group :guard do
+  gem 'guard'
+  gem 'guard-minitest'
 end

data/README.md

@@ -197,5 +197,5 @@ Up-to-date list of contributors: http://github.com/rails-sqlserver/activerecord-
 
 ## License
 
-Copyright © 2008-2015. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Copyright © 2008-2016. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
 

data/VERSION

@@ -1 +1 @@
-4.2.10
+4.2.11

data/appveyor.yml

@@ -11,7 +11,7 @@ install:
   - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
   - ruby --version
   - gem --version
-  - bundle install --without odbc
+  - bundle install --without odbc guard
 build: off
 test_script:
   - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"

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

@@ -54,12 +54,10 @@ module ActiveRecord
           case value
           when Type::Binary::Data
             "0x#{value.hex}"
+          when ActiveRecord::Type::SQLServer::Char::Data
+            value.quoted
           when String, ActiveSupport::Multibyte::Chars
-            if value.is_utf8?
-              "#{QUOTED_STRING_PREFIX}#{super}"
-            else
-              super
-            end
+            "#{QUOTED_STRING_PREFIX}#{super}"
           else
             super
           end

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

@@ -96,6 +96,7 @@ module ActiveRecord
         end
 
         def change_column_default(table_name, column_name, default)
+          schema_cache.clear_table_cache!(table_name)
           remove_default_constraint(table_name, column_name)
           column_object = schema_cache.columns(table_name).find { |c| c.name.to_s == column_name.to_s }
           do_execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name, column_name)} DEFAULT #{quote_default_value(default, column_object)} FOR #{quote_column_name(column_name)}"

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

@@ -8,6 +8,24 @@ module ActiveRecord
             :char
           end
 
+          def type_cast_for_database(value)
+            return if value.nil?
+            return value if value.is_a?(Data)
+            Data.new(super)
+          end
+
+          class Data
+
+            def initialize(value)
+              @value = value.to_s
+            end
+
+            def quoted
+              "'#{@value}'"
+            end
+
+          end
+
         end
       end
     end

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

@@ -9,9 +9,13 @@ module ActiveRecord
 
           def cast_fractional(value)
             return value if !value.respond_to?(fractional_property) || value.send(fractional_property).zero?
-            seconds = value.send(fractional_property).to_f / fractional_operator.to_f
-            seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
-            frac_seconds = (seconds * fractional_operator).to_i
+            frac_seconds = if fractional_scale == 0
+                             0
+                           else
+                             seconds = value.send(fractional_property).to_f / fractional_operator.to_f
+                             seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
+                             (seconds * fractional_operator).to_i
+                           end
             value.change fractional_property => frac_seconds
           end
 

data/lib/arel/visitors/sqlserver.rb

@@ -74,7 +74,10 @@ module Arel
       end
 
       def visit_Arel_Table o, collector
-        table_name = if o.engine.connection.database_prefix_remote_server?
+        # Apparently, o.engine.connection can actually be a different adapter
+        # than sqlserver. Can be removed if fixed in ActiveRecord. See:
+        # github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues/450
+        table_name = if o.engine.connection.respond_to?(:sqlserver?) && o.engine.connection.database_prefix_remote_server?
           remote_server_table_name(o)
         else
           quote_table_name(o.name)

data/test/cases/column_test_sqlserver.rb

@@ -373,6 +373,13 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       obj.datetime2_1.must_equal time.change(nsec: 100000000), "Nanoseconds were <#{obj.datetime2_1.nsec}> vs <100000000>"
       obj.save! ; obj.reload
       obj.datetime2_1.must_equal time.change(nsec: 100000000), "Nanoseconds were <#{obj.datetime2_1.nsec}> vs <100000000>"
+      col = column('datetime2_0')
+      col.cast_type.precision.must_equal 0
+      time = Time.utc 2016, 4, 19, 16, 45, 40, 771036
+      obj.datetime2_0 = time
+      obj.datetime2_0.must_equal time.change(nsec: 0), "Nanoseconds were <#{obj.datetime2_0.nsec}> vs <0>"
+      obj.save! ; obj.reload
+      obj.datetime2_0.must_equal time.change(nsec: 0), "Nanoseconds were <#{obj.datetime2_0.nsec}> vs <0>"
     end
 
     it 'datetimeoffset' do

data/test/cases/specific_schema_test_sqlserver.rb

@@ -107,6 +107,24 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     assert_equal r, SSTestEdgeSchema.where('crazy]]quote' => 'crazyqoute').first
   end
 
+  it 'various methods to bypass national quoted columns for any column, but primarily useful for char/varchar' do
+    value = Class.new do
+      def quoted_id
+        "'T'"
+      end
+    end
+    # Using ActiveRecord's quoted_id feature for objects.
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: value.new).first }
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: value.new).first }
+    # Using our custom char type data.
+    data = ActiveRecord::Type::SQLServer::Char::Data
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: data.new('T')).first }
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: data.new('T')).first }
+    # Taking care of everything.
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: 'T').first }
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: 'T').first }
+  end
+
   # With column names that have spaces
 
   it 'create record using a custom attribute reader and be able to load it back in' do

data/test/schema/datatypes/2012.sql

@@ -28,6 +28,7 @@ CREATE TABLE [sst_datatypes] (
   [datetime2_7] [datetime2](7) NULL DEFAULT '9999-12-31 23:59:59.9999999',
   [datetime2_3] [datetime2](3) NULL,
   [datetime2_1] [datetime2](1) NULL,
+  [datetime2_0] [datetime2](0) NULL,
   [datetimeoffset_7] [datetimeoffset](7) NULL DEFAULT '1984-01-24 04:20:00.1234567 -08:00',
   [datetimeoffset_3] [datetimeoffset](3) NULL,
   [datetimeoffset_1] [datetimeoffset](1) NULL,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.2.11
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord