From 1a7be948426a7300a8ea5a2cdb4c55d645b2552c Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Sat, 13 Jun 2020 11:04:45 +0900
Subject: [PATCH] Remove useless rescue in `setup` for PostgreSQL adapter tests

All types are supported for PostgreSQL >= 9.3.
---
 .../cases/adapters/postgresql/ltree_test.rb   |  8 +--
 .../cases/adapters/postgresql/range_test.rb   | 50 +++++++++----------
 .../cases/adapters/postgresql/xml_test.rb     | 10 +---
 3 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
index 8349ee6ee2..62c24fb2d0 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 ff83380314..4881d2cf10 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 71ead6f7f3..81059351f9 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
-- 
GitLab