pg, preserve money type when dumping schema and extract money default.

3 files changed, 26 insertions, 17 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index d63750a3ea..003573fda6 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -11,11 +11,9 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
-    @connection.transaction do
-      @connection.create_table('postgresql_bit_strings') do |t|
-        t.bit :a_bit, default: "00000011", limit: 8
-        t.bit_varying :a_bit_varying, default: "0011", limit: 4
-      end
+    @connection.create_table('postgresql_bit_strings') do |t|
+      t.bit :a_bit, default: "00000011", limit: 8
+      t.bit_varying :a_bit_varying, default: "0011", limit: 4
     end
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index e109f1682b..a3a2a5ff23 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -1,20 +1,28 @@
 # encoding: utf-8
-
 require "cases/helper"
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
+require 'support/schema_dumping_helper'
 
 class PostgresqlMoneyTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
   class PostgresqlMoney < ActiveRecord::Base; end
 
   setup do
     @connection = ActiveRecord::Base.connection
     @connection.execute("set lc_monetary = 'C'")
+    @connection.create_table('postgresql_moneys') do |t|
+      t.column "wealth", "money"
+      t.column "depth", "money", default: "150.55"
+    end
+  end
+
+  teardown do
+    @connection.execute 'DROP TABLE IF EXISTS postgresql_moneys'
   end
 
   def test_column
     column = PostgresqlMoney.columns_hash["wealth"]
-    assert_equal :decimal, column.type
+    assert_equal :money, column.type
     assert_equal "money", column.sql_type
     assert_equal 2, column.scale
     assert column.number?
@@ -23,6 +31,10 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     assert_not column.array
   end
 
+  def test_default
+    assert_equal BigDecimal.new("150.55"), PostgresqlMoney.new.depth
+  end
+
   def test_money_values
     @connection.execute("INSERT INTO postgresql_moneys (id, wealth) VALUES (1, '567.89'::money)")
     @connection.execute("INSERT INTO postgresql_moneys (id, wealth) VALUES (2, '-567.89'::money)")
@@ -41,6 +53,12 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
     assert_equal(-2.25, column.type_cast("($2.25)"))
   end
 
+  def test_schema_dumping
+    output = dump_table_schema("postgresql_moneys")
+    assert_match %r{t\.money\s+"wealth",\s+scale: 2$}, output
+    assert_match %r{t\.money\s+"depth",\s+scale: 2,\s+default: 150.55$}, output
+  end
+
   def test_create_and_update_money
     money = PostgresqlMoney.create(wealth: "987.65")
     assert_equal 987.65, money.wealth
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index d4da3b3bc1..e9294a11b9 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -1,6 +1,6 @@
 ActiveRecord::Schema.define do
 
-  %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_bit_strings postgresql_uuids postgresql_ltrees
+  %w(postgresql_tsvectors postgresql_hstores postgresql_arrays postgresql_moneys postgresql_numbers postgresql_times postgresql_network_addresses postgresql_uuids postgresql_ltrees
       postgresql_oids postgresql_xml_data_type defaults geometrics postgresql_timestamp_with_zones postgresql_partitioned_table postgresql_partitioned_table_parent postgresql_json_data_type postgresql_citext).each do |table_name|
     execute "DROP TABLE IF EXISTS #{quote_table_name table_name}"
   end
@@ -118,13 +118,6 @@ _SQL
   end
 
   execute <<_SQL
-  CREATE TABLE postgresql_moneys (
-    id SERIAL PRIMARY KEY,
-    wealth MONEY
-  );
-_SQL
-
-  execute <<_SQL
   CREATE TABLE postgresql_numbers (
     id SERIAL PRIMARY KEY,
     single REAL,