pg test, extract tsvector tests into `postgresql/full_text_test.rb`

2 files changed, 31 insertions, 27 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 446808f64b..0dad89c67a 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -1,8 +1,6 @@
 require "cases/helper"
 require 'support/ddl_helper'
 
-class PostgresqlTsvector < ActiveRecord::Base
-end
 
 class PostgresqlNumber < ActiveRecord::Base
 end
@@ -25,10 +23,6 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
   def setup
     @connection = ActiveRecord::Base.connection
 
-    @connection.execute("INSERT INTO postgresql_tsvectors (id, text_vector) VALUES (1, ' ''text'' ''vector'' ')")
-
-    @first_tsvector = PostgresqlTsvector.find(1)
-
     @connection.execute("INSERT INTO postgresql_numbers (id, single, double) VALUES (1, 123.456, 123456.789)")
     @connection.execute("INSERT INTO postgresql_numbers (id, single, double) VALUES (2, '-Infinity', 'Infinity')")
     @connection.execute("INSERT INTO postgresql_numbers (id, single, double) VALUES (3, 123.456, 'NaN')")
@@ -47,12 +41,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
   end
 
   teardown do
-    [PostgresqlTsvector, PostgresqlNumber, PostgresqlTime,
-     PostgresqlBitString, PostgresqlOid].each(&:delete_all)
-  end
-
-  def test_data_type_of_tsvector_types
-    assert_equal :tsvector, @first_tsvector.column_for_attribute(:text_vector).type
+    [PostgresqlNumber, PostgresqlTime, PostgresqlBitString, PostgresqlOid].each(&:delete_all)
   end
 
   def test_data_type_of_number_types
@@ -74,21 +63,6 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal :integer, @first_oid.column_for_attribute(:obj_id).type
   end
 
-  def test_tsvector_values
-    assert_equal "'text' 'vector'", @first_tsvector.text_vector
-  end
-
-  def test_update_tsvector
-    new_text_vector = "'new' 'text' 'vector'"
-    @first_tsvector.text_vector = new_text_vector
-    assert @first_tsvector.save
-    assert @first_tsvector.reload
-    @first_tsvector.text_vector = new_text_vector
-    assert @first_tsvector.save
-    assert @first_tsvector.reload
-    assert_equal new_text_vector, @first_tsvector.text_vector
-  end
-
   def test_number_values
     assert_equal 123.456, @first_number.single
     assert_equal 123456.789, @first_number.double
diff --git a/activerecord/test/cases/adapters/postgresql/full_text_test.rb b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
new file mode 100644
index 0000000000..4442abcbc4
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require "cases/helper"
+require 'active_record/base'
+require 'active_record/connection_adapters/postgresql_adapter'
+
+class PostgresqlFullTextTest < ActiveRecord::TestCase
+  class PostgresqlTsvector < ActiveRecord::Base; end
+
+  def test_tsvector_column
+    column = PostgresqlTsvector.columns_hash["text_vector"]
+    assert_equal :tsvector, column.type
+    assert_equal "tsvector", column.sql_type
+    assert_not column.number?
+    assert_not column.text?
+    assert_not column.binary?
+    assert_not column.array
+  end
+
+  def test_update_tsvector
+    PostgresqlTsvector.create text_vector: "'text' 'vector'"
+    tsvector = PostgresqlTsvector.first
+    assert_equal "'text' 'vector'", tsvector.text_vector
+
+    tsvector.text_vector = "'new' 'text' 'vector'"
+    tsvector.save!
+    assert tsvector.reload
+    assert_equal "'new' 'text' 'vector'", tsvector.text_vector
+  end
+end