diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb index 8349ee6ee2548bd80744af4360d5f4129f846ff3..62c24fb2d0cb88cc9f1f3a0bef10a7575ce13ce9 100644 --- a/activerecord/test/cases/adapters/postgresql/ltree_test.rb +++ b/activerecord/test/cases/adapters/postgresql/ltree_test.rb @@ -14,13 +14,9 @@ def setup enable_extension!("ltree", @connection) - @connection.transaction do - @connection.create_table("ltrees") do |t| - t.ltree "path" - end + @connection.create_table("ltrees") do |t| + t.ltree "path" end - rescue ActiveRecord::StatementInvalid - skip "do not test on PG without ltree" end teardown do diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb index ff83380314af0500ece8622f11c3de6479f04e4b..4881d2cf1028cca81bb4eb97246fe3a472a0e0cb 100644 --- a/activerecord/test/cases/adapters/postgresql/range_test.rb +++ b/activerecord/test/cases/adapters/postgresql/range_test.rb @@ -15,35 +15,31 @@ class PostgresqlRangeTest < ActiveRecord::PostgreSQLTestCase def setup @connection = PostgresqlRange.connection - begin - @connection.transaction do - @connection.execute <<~SQL - CREATE TYPE floatrange AS RANGE ( - subtype = float8, - subtype_diff = float8mi - ); - - CREATE TYPE stringrange AS RANGE ( - subtype = varchar - ); - SQL - - @connection.create_table("postgresql_ranges") do |t| - t.daterange :date_range - t.numrange :num_range - t.tsrange :ts_range - t.tstzrange :tstz_range - t.int4range :int4_range - t.int8range :int8_range - end - - @connection.add_column "postgresql_ranges", "float_range", "floatrange" - @connection.add_column "postgresql_ranges", "string_range", "stringrange" + @connection.transaction do + @connection.execute <<~SQL + CREATE TYPE floatrange AS RANGE ( + subtype = float8, + subtype_diff = float8mi + ); + + CREATE TYPE stringrange AS RANGE ( + subtype = varchar + ); + SQL + + @connection.create_table("postgresql_ranges") do |t| + t.daterange :date_range + t.numrange :num_range + t.tsrange :ts_range + t.tstzrange :tstz_range + t.int4range :int4_range + t.int8range :int8_range end - PostgresqlRange.reset_column_information - rescue ActiveRecord::StatementInvalid - skip "do not test on PG without range" + + @connection.add_column "postgresql_ranges", "float_range", "floatrange" + @connection.add_column "postgresql_ranges", "string_range", "stringrange" end + PostgresqlRange.reset_column_information insert_range(id: 101, date_range: "[''2012-01-02'', ''2012-01-04'']", diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb index 71ead6f7f3905c21aebbe09c6b20f1baa463480d..81059351f9b3842caf3c8927e0fd6c70294f5c81 100644 --- a/activerecord/test/cases/adapters/postgresql/xml_test.rb +++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb @@ -11,14 +11,8 @@ class XmlDataType < ActiveRecord::Base def setup @connection = ActiveRecord::Base.connection - begin - @connection.transaction do - @connection.create_table("xml_data_type") do |t| - t.xml "payload" - end - end - rescue ActiveRecord::StatementInvalid - skip "do not test on PG without xml" + @connection.create_table("xml_data_type") do |t| + t.xml "payload" end @column = XmlDataType.columns_hash["payload"] end