1 files changed, 69 insertions, 19 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index ae5b409f99..1219e197ab 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -1,8 +1,5 @@
-# encoding: utf-8
-
 require "cases/helper"
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
+require 'support/schema_dumping_helper'
 
 module PostgresqlUUIDHelper
   def connection
@@ -10,12 +7,13 @@ module PostgresqlUUIDHelper
   end
 
   def drop_table(name)
-    connection.execute "drop table if exists #{name}"
+    connection.drop_table name, if_exists: true
   end
 end
 
 class PostgresqlUUIDTest < ActiveRecord::TestCase
   include PostgresqlUUIDHelper
+  include SchemaDumpingHelper
 
   class UUIDType < ActiveRecord::Base
     self.table_name = "uuid_data_type"
@@ -50,9 +48,10 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     column = UUIDType.columns_hash["guid"]
     assert_equal :uuid, column.type
     assert_equal "uuid", column.sql_type
-    assert_not column.number?
-    assert_not column.binary?
-    assert_not column.array
+    assert_not column.array?
+
+    type = UUIDType.type_for_attribute("guid")
+    assert_not type.binary?
   end
 
   def test_treat_blank_uuid_as_nil
@@ -70,13 +69,18 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     assert_equal 'foobar', uuid.guid_before_type_cast
   end
 
-  def test_rfc_4122_regex
+  def test_acceptable_uuid_regex
     # Valid uuids
     ['A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11',
      '{a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}',
      'a0eebc999c0b4ef8bb6d6bb9bd380a11',
      'a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11',
-     '{a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}'].each do |valid_uuid|
+     '{a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}',
+     # The following is not a valid RFC 4122 UUID, but PG doesn't seem to care,
+     # so we shouldn't block it either. (Pay attention to "fb6d" – the "f" here
+     # is invalid – it must be one of 8, 9, A, B, a, b according to the spec.)
+     '{a0eebc99-9c0b-4ef8-fb6d-6bb9bd380a11}',
+    ].each do |valid_uuid|
       uuid = UUIDType.new guid: valid_uuid
       assert_not_nil uuid.guid
     end
@@ -88,7 +92,6 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
      0.0,
      true,
      'Z0000C99-9C0B-4EF8-BB6D-6BB9BD380A11',
-     '{a0eebc99-9c0b-4ef8-fb6d-6bb9bd380a11}',
      'a0eebc999r0b4ef8ab6d6bb9bd380a11',
      'a0ee-bc99------4ef8-bb6d-6bb9-bd38-0a11',
      '{a0eebc99-bb6d6bb9-bd380a11}'].each do |invalid_uuid|
@@ -108,10 +111,53 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
       assert_equal "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11", uuid.guid
     end
   end
+
+  def test_schema_dump_with_shorthand
+    output = dump_table_schema "uuid_data_type"
+    assert_match %r{t\.uuid "guid"}, output
+  end
+
+  def test_uniqueness_validation_ignores_uuid
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "uuid_data_type"
+      validates :guid, uniqueness: { case_sensitive: false }
+
+      def self.name
+        "UUIDType"
+      end
+    end
+
+    record = klass.create!(guid: "a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11")
+    duplicate = klass.new(guid: record.guid)
+
+    assert record.guid.present? # Ensure we actually are testing a UUID
+    assert_not duplicate.valid?
+  end
+end
+
+class PostgresqlLargeKeysTest < ActiveRecord::TestCase
+  include PostgresqlUUIDHelper
+  include SchemaDumpingHelper
+
+  def setup
+    connection.create_table('big_serials', id: :bigserial) do |t|
+      t.string 'name'
+    end
+  end
+
+  def test_omg
+    schema = dump_table_schema "big_serials"
+    assert_match "create_table \"big_serials\", id: :bigserial", schema
+  end
+
+  def teardown
+    drop_table "big_serials"
+  end
 end
 
 class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
   include PostgresqlUUIDHelper
+  include SchemaDumpingHelper
 
   class UUID < ActiveRecord::Base
     self.table_name = 'pg_uuids'
@@ -171,23 +217,22 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
     end
 
     def test_schema_dumper_for_uuid_primary_key
-      schema = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, schema)
-      assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema.string)
-      assert_match(/t\.uuid   "other_uuid", default: "uuid_generate_v4\(\)"/, schema.string)
+      schema = dump_table_schema "pg_uuids"
+      assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema)
+      assert_match(/t\.uuid   "other_uuid", default: "uuid_generate_v4\(\)"/, schema)
     end
 
     def test_schema_dumper_for_uuid_primary_key_with_custom_default
-      schema = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, schema)
-      assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema.string)
-      assert_match(/t\.uuid   "other_uuid_2", default: "my_uuid_generator\(\)"/, schema.string)
+      schema = dump_table_schema "pg_uuids_2"
+      assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema)
+      assert_match(/t\.uuid   "other_uuid_2", default: "my_uuid_generator\(\)"/, schema)
     end
   end
 end
 
 class PostgresqlUUIDTestNilDefault < ActiveRecord::TestCase
   include PostgresqlUUIDHelper
+  include SchemaDumpingHelper
 
   setup do
     enable_extension!('uuid-ossp', connection)
@@ -211,6 +256,11 @@ class PostgresqlUUIDTestNilDefault < ActiveRecord::TestCase
                                     WHERE a.attname='id' AND a.attrelid = 'pg_uuids'::regclass").first
       assert_nil col_desc["default"]
     end
+
+    def test_schema_dumper_for_uuid_primary_key_with_default_override_via_nil
+      schema = dump_table_schema "pg_uuids"
+      assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: nil/, schema)
+    end
   end
 end