Merge pull request #11382 from kennyj/fix_10751-2

Dump UUID default functions to schema.rb [2nd version]. Fixes #10751.

Conflicts:
	activerecord/CHANGELOG.md

activerecord/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Migration dump UUID default functions to schema.rb.
+
+    Fixes #10751.
+
+    *kennyj*
+
 *   Fixed a bug in `ActiveRecord::Associations::CollectionAssociation#find_by_scan`
     when using `has_many` association with `:inverse_of` option and UUID primary key.
 

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -45,16 +45,18 @@ module ActiveRecord
   module ConnectionAdapters
     # PostgreSQL-specific extensions to column definitions in a table.
     class PostgreSQLColumn < Column #:nodoc:
-      attr_accessor :array
+      attr_accessor :array, :default_function
       # Instantiates a new PostgreSQL column definition in a table.
       def initialize(name, default, oid_type, sql_type = nil, null = true)
         @oid_type = oid_type
+        default_value     = self.class.extract_value_from_default(default)
+        @default_function = default if !default_value && default && default =~ /.+\(.*\)/
         if sql_type =~ /\[\]$/
           @array = true
-          super(name, self.class.extract_value_from_default(default), sql_type[0..sql_type.length - 3], null)
+          super(name, default_value, sql_type[0..sql_type.length - 3], null)
         else
           @array = false
-          super(name, self.class.extract_value_from_default(default), sql_type, null)
+          super(name, default_value, sql_type, null)
         end
       end
 
@@ -439,6 +441,7 @@ module ActiveRecord
       def prepare_column_options(column, types)
         spec = super
         spec[:array] = 'true' if column.respond_to?(:array) && column.array
+        spec[:default] = "\"#{column.default_function}\"" if column.respond_to?(:default_function) && column.default_function
         spec
       end
 

activerecord/test/cases/adapters/postgresql/uuid_test.rb

@@ -61,6 +61,7 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     schema = StringIO.new
     ActiveRecord::SchemaDumper.dump(@connection, schema)
     assert_match(/\bcreate_table "pg_uuids", id: :uuid\b/, schema.string)
+    assert_match(/t\.uuid   "other_uuid", default: "uuid_generate_v4\(\)"/, schema.string)
   end
 end