6 files changed, 47 insertions, 11 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 462c7ae115..5646c1a0f2 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   After a successful `reload`, `new_record?` is always false.
+
+    Fixes #12101.
+
+    *Matthew Draper*
+
 *   PostgreSQL renaming table doesn't attempt to rename non existent sequences.
 
     *Abdelkader Boudih*
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 7c485eb9d0..39b36731cd 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -34,13 +34,6 @@ module ActiveRecord
             else
               super
             end
-          when Numeric
-            if sql_type == 'money' || [:string, :text].include?(column.type)
-              # Not truly string input, so doesn't require (or allow) escape string syntax.
-              "'#{value}'"
-            else
-              super
-            end
           when String
             case sql_type
             when 'xml'   then "xml '#{quote_string(value)}'"
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index ee634d7bb3..96e44c2f59 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -396,6 +396,7 @@ module ActiveRecord
         end
 
       @attributes = fresh_object.instance_variable_get('@attributes')
+      @new_record = false
       self
     end
 
diff --git a/activerecord/lib/active_record/type/string.rb b/activerecord/lib/active_record/type/string.rb
index 14b03dcb2d..8cc533bc41 100644
--- a/activerecord/lib/active_record/type/string.rb
+++ b/activerecord/lib/active_record/type/string.rb
@@ -16,10 +16,10 @@ module ActiveRecord
       end
 
       def type_cast_for_database(value)
-        if value.is_a?(::String)
-          ::String.new(value)
-        else
-          super
+        case value
+        when ::Numeric then value.to_s
+        when ::String then ::String.new(value)
+        else super
         end
       end
 
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index cf2a4ab6ea..fa5e3cc281 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -70,4 +70,28 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     money.reload
     assert_equal new_value, money.wealth
   end
+
+  def test_update_all_with_money_string
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: "987.65")
+    money.reload
+
+    assert_equal 987.65, money.wealth
+  end
+
+  def test_update_all_with_money_big_decimal
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: '123.45'.to_d)
+    money.reload
+
+    assert_equal 123.45, money.wealth
+  end
+
+  def test_update_all_with_money_numeric
+    money = PostgresqlMoney.create!
+    PostgresqlMoney.update_all(wealth: 123.45)
+    money.reload
+
+    assert_equal 123.45, money.wealth
+  end
 end
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 1192ecd6b4..9b762fc0d5 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -865,4 +865,16 @@ class PersistenceTest < ActiveRecord::TestCase
     assert_equal 1, post[:wibble]
     assert_nil post.reload[:wibble]
   end
+
+  def test_find_via_reload
+    post = Post.new
+
+    assert post.new_record?
+
+    post.id = 1
+    post.reload
+
+    assert_equal "Welcome to the weblog", post.title
+    assert_not post.new_record?
+  end
 end