1 files changed, 27 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/full_text_test.rb b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
index 9dadb177ca..bde7513339 100644
--- a/activerecord/test/cases/adapters/postgresql/full_text_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
@@ -1,21 +1,34 @@
-# encoding: utf-8
 require "cases/helper"
+require 'support/schema_dumping_helper'
 
-class PostgresqlFullTextTest < ActiveRecord::TestCase
-  class PostgresqlTsvector < ActiveRecord::Base; end
+class PostgresqlFullTextTest < ActiveRecord::PostgreSQLTestCase
+  include SchemaDumpingHelper
+  class Tsvector < ActiveRecord::Base; end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table('tsvectors') do |t|
+      t.tsvector 'text_vector'
+    end
+  end
+
+  teardown do
+    @connection.drop_table 'tsvectors', if_exists: true
+  end
 
   def test_tsvector_column
-    column = PostgresqlTsvector.columns_hash["text_vector"]
+    column = Tsvector.columns_hash["text_vector"]
     assert_equal :tsvector, column.type
     assert_equal "tsvector", column.sql_type
-    assert_not column.number?
-    assert_not column.binary?
-    assert_not column.array
+    assert_not column.array?
+
+    type = Tsvector.type_for_attribute("text_vector")
+    assert_not type.binary?
   end
 
   def test_update_tsvector
-    PostgresqlTsvector.create text_vector: "'text' 'vector'"
-    tsvector = PostgresqlTsvector.first
+    Tsvector.create text_vector: "'text' 'vector'"
+    tsvector = Tsvector.first
     assert_equal "'text' 'vector'", tsvector.text_vector
 
     tsvector.text_vector = "'new' 'text' 'vector'"
@@ -23,4 +36,9 @@ class PostgresqlFullTextTest < ActiveRecord::TestCase
     assert tsvector.reload
     assert_equal "'new' 'text' 'vector'", tsvector.text_vector
   end
+
+  def test_schema_dump_with_shorthand
+    output = dump_table_schema("tsvectors")
+    assert_match %r{t\.tsvector "text_vector"}, output
+  end
 end