Skip to content

Commit 791ae18

Browse files
committed
Compatible with Rails 4.2.1.
1 parent 6fd5ff2 commit 791ae18

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2+
## v4.2.4
3+
4+
* Compatible with Rails 4.2.1.
5+
6+
17
## v4.2.3
28

39
* Fix SET defaults when using Azure.

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def commit_db_transaction
6565
do_execute 'COMMIT TRANSACTION'
6666
end
6767

68-
def rollback_db_transaction
68+
def exec_rollback_db_transaction
6969
do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
7070
end
7171

@@ -75,7 +75,7 @@ def create_savepoint(name = current_savepoint_name)
7575
do_execute "SAVE TRANSACTION #{name}"
7676
end
7777

78-
def rollback_to_savepoint(name = current_savepoint_name)
78+
def exec_rollback_to_savepoint(name = current_savepoint_name)
7979
do_execute "ROLLBACK TRANSACTION #{name}"
8080
end
8181

lib/active_record/connection_adapters/sqlserver/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module ConnectionAdapters
33
module SQLServer
44
module Version
55

6-
VERSION = '4.2.3'
6+
VERSION = '4.2.4'
77

88
end
99
end

test/cases/column_test_sqlserver.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ def assert_obj_set_and_save(attribute, value)
4646
type.must_be :number?
4747
type.limit.must_equal 8
4848
assert_obj_set_and_save :bigint, -9_223_372_036_854_775_808
49-
assert_raises(RangeError) { new_obj.bigint = -9_223_372_036_854_775_809 }
5049
assert_obj_set_and_save :bigint, 9_223_372_036_854_775_807
51-
assert_raises(RangeError) { new_obj.bigint = 9_223_372_036_854_775_808 }
5250
end
5351

5452
it 'int(4)' do
@@ -64,9 +62,7 @@ def assert_obj_set_and_save(attribute, value)
6462
type.must_be :number?
6563
type.limit.must_equal 4
6664
assert_obj_set_and_save :int, -2_147_483_648
67-
assert_raises(RangeError) { new_obj.int = -2_147_483_649 }
6865
assert_obj_set_and_save :int, 2_147_483_647
69-
assert_raises(RangeError) { new_obj.int = 2_147_483_648 }
7066
end
7167

7268
it 'smallint(2)' do
@@ -82,9 +78,7 @@ def assert_obj_set_and_save(attribute, value)
8278
type.must_be :number?
8379
type.limit.must_equal 2
8480
assert_obj_set_and_save :smallint, -32_768
85-
assert_raises(RangeError) { new_obj.smallint = -32_769 }
8681
assert_obj_set_and_save :smallint, 32_767
87-
assert_raises(RangeError) { new_obj.smallint = 32_768 }
8882
end
8983

9084
it 'tinyint(1)' do
@@ -100,9 +94,7 @@ def assert_obj_set_and_save(attribute, value)
10094
type.must_be :number?
10195
type.limit.must_equal 1
10296
assert_obj_set_and_save :tinyint, 0
103-
assert_raises(RangeError) { new_obj.tinyint = -1 }
10497
assert_obj_set_and_save :tinyint, 255
105-
assert_raises(RangeError) { new_obj.tinyint = 256 }
10698
end
10799

108100
it 'bit' do

0 commit comments

Comments
 (0)