Merge branch 'joelhoffman-postgres_schema_builder' into instance_reader

* joelhoffman-postgres_schema_builder:
  Also support writing the hstore back to the database
  Hstore values are all strings
  string_to_hstore / hstore_to_string, serializing
  don't test schema where hstore not installed
  schema dumper tests for hstore
  Additional hstore tests, supporting null values, better compliance with postgres docs
  add hstore to postgres native types and defaults

Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index c79382a984..4de0999dbb 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -238,6 +238,13 @@ class SchemaDumperTest < ActiveRecord::TestCase
 
     def test_schema_dump_includes_tsvector_shorthand_definition
       output = standard_dump
+      if %r{create_table "postgresql_hstores"} =~ output
+        assert_match %r{t.hstore "hash_store", default => ""}, output
+      end
+    end
+
+    def test_schema_dump_includes_tsvector_shorthand_definition
+      output = standard_dump
       if %r{create_table "postgresql_tsvectors"} =~ output
         assert_match %r{t.tsvector "text_vector"}, output
       end