Skip to content

Commit 9dcf480

Browse files
committed
[test] adjust derby tests to conform to how default values are expected on AR 4.2
1 parent d876a43 commit 9dcf480

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/db/derby/simple_test.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ def test_text_and_string_conversions
129129
end
130130

131131
def test_data_types
132+
def_val = lambda { |val| ArJdbc::AR42 ? val.to_s : val }
132133
# from test/models/data_types.rb, with the modifications as noted in the comments.
133134
expected_types = [
134135
["id", :integer, { }],
@@ -140,7 +141,7 @@ def test_data_types
140141
["sample_decimal", :decimal, {:precision => 9, :scale => nil}] :
141142
# NOTE: it's an :integer because the :scale is 0 (...right?) :
142143
["sample_decimal", :integer, {:precision => 9, :scale => 0}],
143-
["sample_small_decimal", :decimal, { :precision => 3, :scale => 2, :default => 3.14 }],
144+
["sample_small_decimal", :decimal, { :precision => 3, :scale => 2, :default => def_val.call(3.14) }],
144145
ArJdbc::AR42 ?
145146
["sample_default_decimal", :decimal, {}] : # decimal by default assumes :scale => 0
146147
["sample_default_decimal", :integer, {}], # decimal by default assumes :scale => 0
@@ -152,7 +153,7 @@ def test_data_types
152153
["sample_integer_with_limit_2", :integer, { }], # don't care about the limit
153154
["sample_integer_with_limit_8", :integer, { }], # don't care about the limit
154155
["sample_integer_no_limit", :integer, { }],
155-
["sample_integer_neg_default", :integer, { :default => -1 }],
156+
["sample_integer_neg_default", :integer, { :default => def_val.call(-1) }],
156157
["sample_text", :text, { }],
157158
ArJdbc::AR42 ?
158159
["big_decimal", :decimal, {:precision => 31, :scale => nil}] :

0 commit comments

Comments
 (0)