Add support for Postgresql JSONB

[Philippe Creux, Chris Teague]

1 files changed, 25 insertions, 9 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index cb3c02fa3a..86ba849445 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -4,7 +4,7 @@ require "cases/helper"
 require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
-class PostgresqlJSONTest < ActiveRecord::TestCase
+module PostgresqlJSONSharedTestCases
   class JsonDataType < ActiveRecord::Base
     self.table_name = 'json_data_type'
 
@@ -16,8 +16,8 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     begin
       @connection.transaction do
         @connection.create_table('json_data_type') do |t|
-          t.json 'payload', :default => {}
-          t.json 'settings'
+          t.public_send column_type, 'payload', default: {} # t.json 'payload', default: {}
+          t.public_send column_type, 'settings'             # t.json 'settings'
         end
       end
     rescue ActiveRecord::StatementInvalid
@@ -26,21 +26,21 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     @column = JsonDataType.columns_hash['payload']
   end
 
-  teardown do
+  def teardown
     @connection.execute 'drop table if exists json_data_type'
   end
 
   def test_column
     column = JsonDataType.columns_hash["payload"]
-    assert_equal :json, column.type
-    assert_equal "json", column.sql_type
+    assert_equal column_type, column.type
+    assert_equal column_type.to_s, column.sql_type
     assert_not column.number?
     assert_not column.binary?
     assert_not column.array
   end
 
   def test_default
-    @connection.add_column 'json_data_type', 'permissions', :json, default: '{"users": "read", "posts": ["read", "write"]}'
+    @connection.add_column 'json_data_type', 'permissions', column_type, default: '{"users": "read", "posts": ["read", "write"]}'
     JsonDataType.reset_column_information
 
     assert_equal({"users"=>"read", "posts"=>["read", "write"]}, JsonDataType.column_defaults['permissions'])
@@ -52,11 +52,11 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
   def test_change_table_supports_json
     @connection.transaction do
       @connection.change_table('json_data_type') do |t|
-        t.json 'users', default: '{}'
+        t.public_send column_type, 'users', default: '{}' # t.json 'users', default: '{}'
       end
       JsonDataType.reset_column_information
       column = JsonDataType.columns_hash['users']
-      assert_equal :json, column.type
+      assert_equal column_type, column.type
 
       raise ActiveRecord::Rollback # reset the schema change
     end
@@ -175,3 +175,19 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     assert_not json.changed?
   end
 end
+
+class PostgresqlJSONTest < ActiveRecord::TestCase
+  include PostgresqlJSONSharedTestCases
+
+  def column_type
+    :json
+  end
+end
+
+class PostgresqlJSONBTest < ActiveRecord::TestCase
+  include PostgresqlJSONSharedTestCases
+
+  def column_type
+    :jsonb
+  end
+end