aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-21 12:47:26 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-12-21 12:48:07 -0300
commitaefcd342c4c447f471e285ff666fa1ced7f11754 (patch)
tree9102f59643b9ea18e5b92b34424d21077b13f482
parentc7d7e7f751da1d23a0b8dcef49fa3df0ea3061e8 (diff)
downloadrails-aefcd342c4c447f471e285ff666fa1ced7f11754.tar.gz
rails-aefcd342c4c447f471e285ff666fa1ced7f11754.tar.bz2
rails-aefcd342c4c447f471e285ff666fa1ced7f11754.zip
Wrap table creation in a transaction.
This will make the tests pass when the intrange datatype is not present
-rw-r--r--activerecord/test/cases/adapters/postgresql/intrange_test.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/intrange_test.rb b/activerecord/test/cases/adapters/postgresql/intrange_test.rb
index 58628cebc8..5f6a64619d 100644
--- a/activerecord/test/cases/adapters/postgresql/intrange_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/intrange_test.rb
@@ -12,9 +12,11 @@ class PostgresqlIntrangesTest < ActiveRecord::TestCase
def setup
@connection = ActiveRecord::Base.connection
begin
- @connection.create_table('intrange_data_type') do |t|
- t.intrange 'int_range', :default => (1..10)
- t.intrange 'long_int_range', :limit => 8, :default => (1..100)
+ @connection.transaction do
+ @connection.create_table('intrange_data_type') do |t|
+ t.intrange 'int_range', :default => (1..10)
+ t.intrange 'long_int_range', :limit => 8, :default => (1..100)
+ end
end
rescue ActiveRecord::StatementInvalid
return skip "do not test on PG without ranges"
@@ -56,7 +58,7 @@ class PostgresqlIntrangesTest < ActiveRecord::TestCase
assert_equal((1..100), @long_int_range_column.default)
assert_equal("int8range", @long_int_range_column.sql_type)
end
-
+
def test_rewrite
@connection.execute "insert into intrange_data_type (int_range) VALUES ('(1, 6)')"
x = IntRangeDataType.first
@@ -75,7 +77,7 @@ class PostgresqlIntrangesTest < ActiveRecord::TestCase
x = IntRangeDataType.first
assert_equal((nil..nil), x.int_range)
end
-
+
def test_rewrite_to_nil
@connection.execute %q|insert into intrange_data_type (int_range) VALUES('(1, 4]')|
x = IntRangeDataType.first
@@ -101,4 +103,4 @@ class PostgresqlIntrangesTest < ActiveRecord::TestCase
IntRangeDataType.create!(int_range: "empty1")
end
end
-end \ No newline at end of file
+end