activerecord-sqlserver-adapter 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8606998a19306cd6a40b95820dcfc2f1f84982
-  data.tar.gz: 1890a0231b4a9c1e3545b5171d0e84fa2461d72a
+  metadata.gz: 66376e3352f343f00ed459b35bd3ea825209cd66
+  data.tar.gz: 4b8ee4f3981be083fc8e6be1733e182bef5b3b83
 SHA512:
-  metadata.gz: 13d82553f8f91bfd76b755b925b3098b3882ed0921288ef9cf117d9edd68f60cd981d984e2d4831a51b64b0737a2d39f7b879a27b77e4746f9a9b61db76bc56d
-  data.tar.gz: c06d4c021c47236b83d79a132a19e72b89f7fc7fcb4dcd62751a63c858eafb8a28f9c4d01f566abcddb75a32dcb8229f29b9a874d6fbbd3afa7e5fd1c8ae9eff
+  metadata.gz: 35ce29a0a1666f992f6335d0d106a4317abca6891dc758f00a838292db8ddc82e318e0dbe16f6852c1c25a82bdacb44e0bf99598b321c0b4cf86664e49d6b465
+  data.tar.gz: 2d7490d9c29f9cc571e35daab9b5daee3fa6ba910a287b84c5dff9c906f8f9bfb595a730aa90bba4600db63ae8f553ee9df68cba4e56af8a59072b09e750ec69

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+
+## v4.2.4
+
+* Compatible with Rails 4.2.1.
+* Fix schema limit reflection for char/varchar. Fixes #394.
+
+
 ## v4.2.3
 
 * Fix SET defaults when using Azure.

data/activerecord-sqlserver-adapter.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.add_dependency 'activerecord', '~> 4.2.0'
+  spec.add_dependency 'activerecord', '~> 4.2.1'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest', '< 5.3.4' # PENDING: [Rails5.x] Remove test order constraint.
   spec.add_development_dependency 'minitest-focus'

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

@@ -65,7 +65,7 @@ module ActiveRecord
           do_execute 'COMMIT TRANSACTION'
         end
 
-        def rollback_db_transaction
+        def exec_rollback_db_transaction
           do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
         end
 
@@ -75,7 +75,7 @@ module ActiveRecord
           do_execute "SAVE TRANSACTION #{name}"
         end
 
-        def rollback_to_savepoint(name = current_savepoint_name)
+        def exec_rollback_to_savepoint(name = current_savepoint_name)
           do_execute "ROLLBACK TRANSACTION #{name}"
         end
 

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

@@ -235,7 +235,7 @@ module ActiveRecord
             columns.DATETIME_PRECISION AS datetime_precision,
             columns.ordinal_position,
             CASE
-              WHEN columns.DATA_TYPE IN ('nchar','nvarchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
+              WHEN columns.DATA_TYPE IN ('nchar','nvarchar','char','varchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
               ELSE COL_LENGTH('#{database}'+columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME, columns.COLUMN_NAME)
             END AS [length],
             CASE

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module SQLServer
       module Version
 
-        VERSION = '4.2.3'
+        VERSION = '4.2.4'
 
       end
     end

data/test/cases/column_test_sqlserver.rb

@@ -46,9 +46,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       type.must_be                      :number?
       type.limit.must_equal             8
       assert_obj_set_and_save :bigint, -9_223_372_036_854_775_808
-      assert_raises(RangeError) { new_obj.bigint = -9_223_372_036_854_775_809 }
       assert_obj_set_and_save :bigint, 9_223_372_036_854_775_807
-      assert_raises(RangeError) { new_obj.bigint = 9_223_372_036_854_775_808 }
     end
 
     it 'int(4)' do
@@ -64,9 +62,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       type.must_be                      :number?
       type.limit.must_equal             4
       assert_obj_set_and_save :int, -2_147_483_648
-      assert_raises(RangeError) { new_obj.int = -2_147_483_649 }
       assert_obj_set_and_save :int, 2_147_483_647
-      assert_raises(RangeError) { new_obj.int = 2_147_483_648 }
     end
 
     it 'smallint(2)' do
@@ -82,9 +78,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       type.must_be                      :number?
       type.limit.must_equal             2
       assert_obj_set_and_save :smallint, -32_768
-      assert_raises(RangeError) { new_obj.smallint = -32_769 }
       assert_obj_set_and_save :smallint, 32_767
-      assert_raises(RangeError) { new_obj.smallint = 32_768 }
     end
 
     it 'tinyint(1)' do
@@ -100,9 +94,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       type.must_be                      :number?
       type.limit.must_equal             1
       assert_obj_set_and_save :tinyint, 0
-      assert_raises(RangeError) { new_obj.tinyint = -1 }
       assert_obj_set_and_save :tinyint, 255
-      assert_raises(RangeError) { new_obj.tinyint = 256 }
     end
 
     it 'bit' do

data/test/cases/specific_schema_test_sqlserver.rb

@@ -5,10 +5,16 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
   after { SSTestEdgeSchema.delete_all }
 
   it 'handle dollar symbols' do
-    SSTestDollarTableName.new.save
+    SSTestDollarTableName.create!
     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'
     obj.id.is_a? Fixnum

data/test/models/sqlserver/dot_table_name.rb

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

data/test/schema/sqlserver_specific_schema.rb

@@ -41,6 +41,10 @@ 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: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +273,7 @@ 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
@@ -333,6 +348,7 @@ 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