2 files changed, 21 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index b7791078db..49f5ec250f 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -396,6 +396,23 @@ module ActiveRecord
         reset_connection
       end
 
+      def test_unparsed_defaults_are_at_least_set_when_saving
+        with_example_table "id SERIAL PRIMARY KEY, number INTEGER NOT NULL DEFAULT (4 + 4) * 2 / 4" do
+          number_klass = Class.new(ActiveRecord::Base) do
+            self.table_name = 'ex'
+          end
+          column = number_klass.columns_hash["number"]
+          assert_nil column.default
+          assert_nil column.default_function
+
+          first_number = number_klass.new
+          assert_nil first_number.number
+
+          first_number.save!
+          assert_equal 4, first_number.reload.number
+        end
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index bdf8e15e3e..ffce7c0d5f 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -45,12 +45,14 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     UUIDType.reset_column_information
     column = UUIDType.columns.find { |c| c.name == 'thingy' }
     assert_equal "uuid_generate_v1()", column.default_function
-    
+
     @connection.change_column :uuid_data_type, :thingy, :uuid, null: false, default: "uuid_generate_v4()"
-    
+
     UUIDType.reset_column_information
     column = UUIDType.columns.find { |c| c.name == 'thingy' }
     assert_equal "uuid_generate_v4()", column.default_function
+  ensure
+    UUIDType.reset_column_information
   end
 
   def test_data_type_of_uuid_types