Merge pull request #14400 from tgxworld/ensure_tables_are_dropped_aft…

…er_test Drop custom tables after each test.
rails · Mar 20, 2014 · 2ca3f33 · 2ca3f33
2 parents 582cbff + 79405a0
commit 2ca3f33
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -1,9 +1,12 @@
 # encoding: utf-8
 require "cases/helper"
+require 'support/ddl_helper'
 
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapterTest < ActiveRecord::TestCase
+      include DdlHelper
+
       def setup
         @connection = ActiveRecord::Base.connection
       end
@@ -369,12 +372,8 @@ def insert(ctx, data)
         ctx.exec_insert(sql, 'SQL', binds)
       end
 
-      def with_example_table(definition = nil)
+      def with_example_table(definition = 'id serial primary key, number integer, data character varying(255)', &block)
-        definition ||= 'id serial primary key, number integer, data character varying(255)'
+        super(@connection, 'ex', definition, &block)
-        @connection.exec_query("create table ex(#{definition})")
-        yield
-      ensure
-        @connection.exec_query('drop table if exists ex')
       end
 
       def connection_without_insert_returning

diff --git a/activerecord/test/support/ddl_helper.rb b/activerecord/test/support/ddl_helper.rb
@@ -0,0 +1,8 @@
+module DdlHelper
+  def with_example_table(connection, table_name, definition = nil)
+    connection.exec_query("CREATE TABLE #{table_name}(#{definition})")
+    yield
+  ensure
+    connection.exec_query("DROP TABLE #{table_name}")
+  end
+end