From 563c16c7cbccc2f3a088139bfb855865a51b027e Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Fri, 2 Jun 2017 04:43:08 +0900
Subject: Add JSON attribute test cases for SQLite3 adapter

---
 .../connection_adapters/abstract_adapter.rb        |  2 ++
 .../connection_adapters/abstract_mysql_adapter.rb  |  1 -
 .../test/cases/adapters/sqlite3/json_test.rb       | 29 ++++++++++++++++++++++
 activerecord/test/cases/json_shared_test_cases.rb  |  2 ++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 activerecord/test/cases/adapters/sqlite3/json_test.rb

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 8c889f98f5..6859feb2f3 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -478,6 +478,8 @@ module ActiveRecord
           m.alias_type %r(number)i,    "decimal"
           m.alias_type %r(double)i,    "float"
 
+          m.register_type %r(^json)i, Type::Json.new
+
           m.register_type(%r(decimal)i) do |sql_type|
             scale = extract_scale(sql_type)
             precision = extract_precision(sql_type)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index ae991d3d79..add6f8632b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -563,7 +563,6 @@ module ActiveRecord
           m.register_type %r(longblob)i,   Type::Binary.new(limit: 2**32 - 1)
           m.register_type %r(^float)i,     Type::Float.new(limit: 24)
           m.register_type %r(^double)i,    Type::Float.new(limit: 53)
-          m.register_type %r(^json)i,      Type::Json.new
 
           register_integer_type m, %r(^bigint)i,    limit: 8
           register_integer_type m, %r(^int)i,       limit: 4
diff --git a/activerecord/test/cases/adapters/sqlite3/json_test.rb b/activerecord/test/cases/adapters/sqlite3/json_test.rb
new file mode 100644
index 0000000000..568a524058
--- /dev/null
+++ b/activerecord/test/cases/adapters/sqlite3/json_test.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "cases/helper"
+require "cases/json_shared_test_cases"
+
+class SQLite3JSONTest < ActiveRecord::SQLite3TestCase
+  include JSONSharedTestCases
+
+  def setup
+    super
+    @connection.create_table("json_data_type") do |t|
+      t.column "payload", :json, default: {}
+      t.column "settings", :json
+    end
+  end
+
+  def test_default
+    @connection.add_column "json_data_type", "permissions", column_type, default: { "users": "read", "posts": ["read", "write"] }
+    klass.reset_column_information
+
+    assert_equal({ "users" => "read", "posts" => ["read", "write"] }, klass.column_defaults["permissions"])
+    assert_equal({ "users" => "read", "posts" => ["read", "write"] }, klass.new.permissions)
+  end
+
+  private
+    def column_type
+      :json
+    end
+end
diff --git a/activerecord/test/cases/json_shared_test_cases.rb b/activerecord/test/cases/json_shared_test_cases.rb
index 56ec8c8a82..a71485982c 100644
--- a/activerecord/test/cases/json_shared_test_cases.rb
+++ b/activerecord/test/cases/json_shared_test_cases.rb
@@ -30,6 +30,7 @@ module JSONSharedTestCases
   end
 
   def test_change_table_supports_json
+    skip unless @connection.supports_json?
     @connection.change_table("json_data_type") do |t|
       t.public_send column_type, "users"
     end
@@ -40,6 +41,7 @@ module JSONSharedTestCases
   end
 
   def test_schema_dumping
+    skip unless @connection.supports_json?
     output = dump_table_schema("json_data_type")
     assert_match(/t\.#{column_type}\s+"settings"/, output)
   end
-- 
cgit v1.2.3