From 48e3edf9ad724426a3694ca6b589da0d5e0de1ee Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Fri, 7 Nov 2014 10:45:34 +0100
Subject: pg tests, only execute what's necessary.

---
 .../test/cases/adapters/postgresql/bytea_test.rb   |  2 +-
 .../test/cases/adapters/postgresql/hstore_test.rb  | 51 +++++++++++-----------
 2 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'activerecord/test/cases/adapters')

diff --git a/activerecord/test/cases/adapters/postgresql/bytea_test.rb b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
index 7872f91943..ec4aebf03a 100644
--- a/activerecord/test/cases/adapters/postgresql/bytea_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
@@ -17,7 +17,6 @@ class PostgresqlByteaTest < ActiveRecord::TestCase
       end
     end
     @column = ByteaDataType.columns_hash['payload']
-    assert(@column.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLColumn))
   end
 
   teardown do
@@ -25,6 +24,7 @@ class PostgresqlByteaTest < ActiveRecord::TestCase
   end
 
   def test_column
+    assert @column.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLColumn)
     assert_equal :binary, @column.type
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index f14ffe5ddc..6a9c6483fe 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -1,38 +1,38 @@
 # encoding: utf-8
 require "cases/helper"
 
-class PostgresqlHstoreTest < ActiveRecord::TestCase
-  class Hstore < ActiveRecord::Base
-    self.table_name = 'hstores'
+if ActiveRecord::Base.connection.supports_extensions?
+  class PostgresqlHstoreTest < ActiveRecord::TestCase
+    class Hstore < ActiveRecord::Base
+      self.table_name = 'hstores'
 
-    store_accessor :settings, :language, :timezone
-  end
+      store_accessor :settings, :language, :timezone
+    end
 
-  def setup
-    @connection = ActiveRecord::Base.connection
+    def setup
+      @connection = ActiveRecord::Base.connection
 
-    unless @connection.extension_enabled?('hstore')
-      @connection.enable_extension 'hstore'
-      @connection.commit_db_transaction
-    end
+      unless @connection.extension_enabled?('hstore')
+        @connection.enable_extension 'hstore'
+        @connection.commit_db_transaction
+      end
 
-    @connection.reconnect!
+      @connection.reconnect!
 
-    @connection.transaction do
-      @connection.create_table('hstores') do |t|
-        t.hstore 'tags', :default => ''
-        t.hstore 'payload', array: true
-        t.hstore 'settings'
+      @connection.transaction do
+        @connection.create_table('hstores') do |t|
+          t.hstore 'tags', :default => ''
+          t.hstore 'payload', array: true
+          t.hstore 'settings'
+        end
       end
+      @column = Hstore.columns_hash['tags']
     end
-    @column = Hstore.columns_hash['tags']
-  end
 
-  teardown do
-    @connection.execute 'drop table if exists hstores'
-  end
+    teardown do
+      @connection.execute 'drop table if exists hstores'
+    end
 
-  if ActiveRecord::Base.connection.supports_extensions?
     def test_hstore_included_in_extensions
       assert @connection.respond_to?(:extensions), "connection should have a list of extensions"
       assert @connection.extensions.include?('hstore'), "extension list should include hstore"
@@ -312,10 +312,8 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
       dupe = record.dup
       assert_equal({"one" => "two"}, dupe.tags.to_hash)
     end
-  end
-
-  private
 
+    private
     def assert_array_cycle(array)
       # test creation
       x = Hstore.create!(payload: array)
@@ -343,4 +341,5 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
       x.reload
       assert_equal(hash, x.tags)
     end
+  end
 end
-- 
cgit v1.2.3