From 3559230720d4ea52d290da4ff4734b5236220fcd Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Sun, 6 Jul 2014 16:04:14 -0600
Subject: [PATCH] Remove the `text?` predicate from the type objects

This was only used for uniqueness validations. The first usage was in
conjunction with `limit`. Types which cast to string, but are not
considered text cannot have a limit. The second case was only with an
explicit `:case_sensitive => true` option given by the user.
---
 .../postgresql/oid/specialized_string.rb                    | 4 ----
 activerecord/lib/active_record/type/string.rb               | 4 ----
 activerecord/lib/active_record/type/value.rb                | 4 ----
 activerecord/lib/active_record/validations/uniqueness.rb    | 6 ++++--
 activerecord/test/cases/adapters/postgresql/array_test.rb   | 1 -
 .../test/cases/adapters/postgresql/bit_string_test.rb       | 2 --
 activerecord/test/cases/adapters/postgresql/citext_test.rb  | 1 -
 .../test/cases/adapters/postgresql/composite_test.rb        | 2 --
 activerecord/test/cases/adapters/postgresql/domain_test.rb  | 1 -
 activerecord/test/cases/adapters/postgresql/enum_test.rb    | 1 -
 .../test/cases/adapters/postgresql/full_text_test.rb        | 1 -
 .../test/cases/adapters/postgresql/geometric_test.rb        | 1 -
 activerecord/test/cases/adapters/postgresql/hstore_test.rb  | 1 -
 activerecord/test/cases/adapters/postgresql/json_test.rb    | 1 -
 activerecord/test/cases/adapters/postgresql/ltree_test.rb   | 1 -
 activerecord/test/cases/adapters/postgresql/money_test.rb   | 1 -
 activerecord/test/cases/adapters/postgresql/network_test.rb | 3 ---
 activerecord/test/cases/adapters/postgresql/uuid_test.rb    | 1 -
 18 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
index b2a42e9ebbe16..2d2fede4e84d3 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
@@ -8,10 +8,6 @@ class SpecializedString < Type::String # :nodoc:
           def initialize(type)
             @type = type
           end
-
-          def text?
-            false
-          end
         end
       end
     end
diff --git a/activerecord/lib/active_record/type/string.rb b/activerecord/lib/active_record/type/string.rb
index e1791169d8193..150defb106584 100644
--- a/activerecord/lib/active_record/type/string.rb
+++ b/activerecord/lib/active_record/type/string.rb
@@ -5,10 +5,6 @@ def type
         :string
       end
 
-      def text?
-        true
-      end
-
       def changed_in_place?(raw_old_value, new_value)
         if new_value.is_a?(::String)
           raw_old_value != new_value
diff --git a/activerecord/lib/active_record/type/value.rb b/activerecord/lib/active_record/type/value.rb
index 081da7547ec10..e0a783fb4595f 100644
--- a/activerecord/lib/active_record/type/value.rb
+++ b/activerecord/lib/active_record/type/value.rb
@@ -50,10 +50,6 @@ def type_cast_for_schema(value) # :nodoc:
 
       # These predicates are not documented, as I need to look further into
       # their use, and see if they can be removed entirely.
-      def text? # :nodoc:
-        false
-      end
-
       def number? # :nodoc:
         false
       end
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index 04e28a0cfeb92..2a34969a8c5a4 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -61,9 +61,11 @@ def build_relation(klass, table, attribute, value) #:nodoc:
 
         column = klass.columns_hash[attribute_name]
         value  = klass.connection.type_cast(value, column)
-        value  = value.to_s[0, column.limit] if value && column.limit && column.text?
+        if value.is_a?(String) && column.limit
+          value = value.to_s[0, column.limit]
+        end
 
-        if !options[:case_sensitive] && value && column.text?
+        if !options[:case_sensitive] && value.is_a?(String)
           # will use SQL LOWER function before comparison, unless it detects a case insensitive collation
           klass.connection.case_insensitive_comparison(table, attribute, column, value)
         else
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 70585e0148214..8df1b7d18cfce 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -38,7 +38,6 @@ def test_column
     assert_equal :string, @column.type
     assert_equal "character varying", @column.sql_type
     assert @column.array
-    assert_not @column.text?
     assert_not @column.number?
     assert_not @column.binary?
 
diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index 9ee3610afd6b5..72222c01fdfd4 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -26,7 +26,6 @@ def test_bit_string_column
     column = PostgresqlBitString.columns_hash["a_bit"]
     assert_equal :bit, column.type
     assert_equal "bit(8)", column.sql_type
-    assert_not column.text?
     assert_not column.number?
     assert_not column.binary?
     assert_not column.array
@@ -36,7 +35,6 @@ def test_bit_string_varying_column
     column = PostgresqlBitString.columns_hash["a_bit_varying"]
     assert_equal :bit_varying, column.type
     assert_equal "bit varying(4)", column.sql_type
-    assert_not column.text?
     assert_not column.number?
     assert_not column.binary?
     assert_not column.array
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index 90e837d426496..2acb64f81c9c9 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -35,7 +35,6 @@ def test_column
       column = Citext.columns_hash['cival']
       assert_equal :citext, column.type
       assert_equal 'citext', column.sql_type
-      assert_not column.text?
       assert_not column.number?
       assert_not column.binary?
       assert_not column.array
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index 42c68cdae7892..cfab5ca9024c4 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -51,7 +51,6 @@ def test_column
     assert_nil column.type
     assert_equal "full_address", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
@@ -113,7 +112,6 @@ def test_column
     assert_equal :full_address, column.type
     assert_equal "full_address", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/domain_test.rb b/activerecord/test/cases/adapters/postgresql/domain_test.rb
index fd7fdecff132e..1500adb42dee5 100644
--- a/activerecord/test/cases/adapters/postgresql/domain_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/domain_test.rb
@@ -30,7 +30,6 @@ def test_column
     assert_equal :decimal, column.type
     assert_equal "custom_money", column.sql_type
     assert column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index 0e97f37a6c837..d99c4a292e495 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -34,7 +34,6 @@ def test_column
     assert_equal :enum, column.type
     assert_equal "mood", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/full_text_test.rb b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
index ec646de5e9398..9dadb177cad95 100644
--- a/activerecord/test/cases/adapters/postgresql/full_text_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
@@ -9,7 +9,6 @@ def test_tsvector_column
     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
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index faf195783dfe4..6c0adbbeaadd3 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -28,7 +28,6 @@ def test_column
     column = PostgresqlPoint.columns_hash["x"]
     assert_equal :point, column.type
     assert_equal "point", column.sql_type
-    assert_not column.text?
     assert_not column.number?
     assert_not column.binary?
     assert_not column.array
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 2631b6a9390fe..1296eb72c0e1a 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -56,7 +56,6 @@ def test_column
       assert_equal :hstore, @column.type
       assert_equal "hstore", @column.sql_type
       assert_not @column.number?
-      assert_not @column.text?
       assert_not @column.binary?
       assert_not @column.array
     end
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 50135151c2ca6..cb3c02fa3add5 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -35,7 +35,6 @@ def test_column
     assert_equal :json, column.type
     assert_equal "json", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
index ddb7cd658c26b..889e369bd6b14 100644
--- a/activerecord/test/cases/adapters/postgresql/ltree_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
@@ -31,7 +31,6 @@ def test_column
     assert_equal :ltree, column.type
     assert_equal "ltree", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index fa5e3cc281d13..87183174f2f7d 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -26,7 +26,6 @@ def test_column
     assert_equal "money", column.sql_type
     assert_equal 2, column.scale
     assert column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/network_test.rb b/activerecord/test/cases/adapters/postgresql/network_test.rb
index 32085cbb17d2e..4f4c1103fa5ab 100644
--- a/activerecord/test/cases/adapters/postgresql/network_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/network_test.rb
@@ -10,7 +10,6 @@ def test_cidr_column
     assert_equal :cidr, column.type
     assert_equal "cidr", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
@@ -20,7 +19,6 @@ def test_inet_column
     assert_equal :inet, column.type
     assert_equal "inet", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
@@ -30,7 +28,6 @@ def test_macaddr_column
     assert_equal :macaddr, column.type
     assert_equal "macaddr", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index 8b27570a36243..f5b199b46a346 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -51,7 +51,6 @@ def test_data_type_of_uuid_types
     assert_equal :uuid, column.type
     assert_equal "uuid", column.sql_type
     assert_not column.number?
-    assert_not column.text?
     assert_not column.binary?
     assert_not column.array
   end