activerecord-postgres-json 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407ecfb24032a8c34bce6bc34eb02e6ce4845b13ea1d663b41476d8cb59fa3f4
-  data.tar.gz: 1c8e108f8126b9831b20d8f78f2ccac0d00857b4f3c573345d6ebacaa727b43c
+  metadata.gz: 0e25b4dcf74b8f989c6a5bfe4b54e48ee733e5def17452dfca59d61c756b3db2
+  data.tar.gz: 0a9eae8d07eaf12f97688f50fa19952d3d76082148a3d55f587157176c25247c
 SHA512:
-  metadata.gz: f497075d5d89ff8b487d5dd13246cf11ec222d4b681f67b8a48c136f5b3cce4f1fe0edb2bbafe4b6be31630db8e34eca19ad56be72e80eca0415af8542a5329e
-  data.tar.gz: 8061bde4477a992fc2dbac854c2c378f88278eba07c97b531b76f36f3acc70bccd89f75449105a95efbcbceca882a555ffdec4a7eb14178a00674afcb9d36df0
+  metadata.gz: a6c3a987892882a1f4887ffa39bcf502845efc4863cb461cf047c8d829ca7a4da1b3f00f5c51e6274c31720cbab75b56efde55efa6a7d9be97690c4a70900988
+  data.tar.gz: c6571acbf93ea8647e7acaeb95dd9a81bf3130fb16e9468a4c8d11069f49558c9e2e018bf44304184b971aa95e77bc444ec1b49d09bd5bfe46d7a810db6bf7d8

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/activerecord-postgres-json.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: activerecord-postgres-json 0.2.2 ruby lib
+# stub: activerecord-postgres-json 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-json".freeze
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Roman Shterenzon".freeze]
-  s.date = "2020-09-14"
+  s.date = "2020-09-15"
   s.description = "Active Record support for PostgreSQL JSON type".freeze
   s.email = "romanbsd@yahoo.com".freeze
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "activerecord-postgres-json.gemspec",
+    "db/ar_postgre_json_test.sql",
     "lib/activerecord-postgres-json.rb",
     "lib/activerecord-postgres-json/activerecord.rb",
     "lib/activerecord-postgres-json/coders.rb",

data/db/ar_postgre_json_test.sql

@@ -0,0 +1,43 @@
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+CREATE TABLE public.posts (
+    id integer NOT NULL,
+    old_data json,
+    data jsonb
+);
+
+CREATE INDEX index_posts_data_gin ON public.posts USING  gin (data);
+
+CREATE VIEW public.post_questions AS
+ SELECT posts.id,
+    (posts.data ->> 'title'::text) AS title,
+    (posts.data #>> '{author,name}'::text[]) AS author_name,
+    (posts.data #>> '{author,email}'::text[]) AS author_email,
+    ((posts.data ->> 'tags'::text))::jsonb AS tags,
+    ((posts.data ->> 'draft'::text))::boolean AS draft
+   FROM public.posts;
+
+CREATE SEQUENCE public.posts_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE public.posts_id_seq OWNED BY public.posts.id;
+
+ALTER TABLE ONLY public.posts ALTER COLUMN id SET DEFAULT nextval('public.posts_id_seq'::regclass);
+
+ALTER TABLE ONLY public.posts ADD CONSTRAINT posts_pkey PRIMARY KEY (id);

data/lib/activerecord-postgres-json/activerecord.rb

@@ -5,15 +5,20 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
   module ConnectionAdapters
-    PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:json]  = { name: 'json' }
+    # jsonb type isn't known by Rails 3.2.x, 4.0.x and 4.1.x, so the gem is defining it
     PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:jsonb] = { name: 'jsonb' }
 
-    if ::ActiveRecord.version >= Gem::Version.new('4.0.0')
-      # As suggested here: http://www.innovationontherun.com/fixing-unknown-oid-geography-errors-with-postgis-and-rails-4-0/
-      # to prevent the Rails 4.0/4.1 error of
-      # "unknown OID: {field}"
-      PostgreSQLAdapter::OID.register_type('json', PostgreSQLAdapter::OID::Identity.new)
-      PostgreSQLAdapter::OID.register_type('jsonb', PostgreSQLAdapter::OID::Identity.new)
+    if ActiveRecord.respond_to?(:version)
+      if ::ActiveRecord.version >= Gem::Version.new('4.0.0') && ::ActiveRecord.version < Gem::Version.new('4.2.0')
+        # As suggested here:
+        # http://www.innovationontherun.com/fixing-unknown-oid-geography-errors-with-postgis-and-rails-4-0/
+        # to prevent the Rails 4.0/4.1 error of "unknown OID: {field}"
+        PostgreSQLAdapter::OID.register_type('jsonb', PostgreSQLAdapter::OID::Identity.new)
+      end
+    elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+      # json type isn't known by Rails 3.2.x, so the gem is defining it.
+      # Rails 4.0.x and 4.1.x already have it defined
+      PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:json]  = { name: 'json' }
     end
 
     class PostgreSQLColumn < Column

data/spec/activerecord-postgres-json_spec.rb

@@ -3,6 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/support/database_setup')
 
 class Post < ActiveRecord::Base
   serialize :data, ActiveRecord::Coders::JSON.new(symbolize_keys: true)
+
+  # For Rails 3.2.x the json serializer should be explicitly specified, because it is unknown by Rails
+  serialize :old_data, ActiveRecord::Coders::JSON.new(symbolize_keys: true) unless ActiveRecord.respond_to?(:version)
 end
 
 class PostQuestions < ActiveRecord::Base
@@ -10,36 +13,11 @@ class PostQuestions < ActiveRecord::Base
 end
 
 describe 'ActiverecordPostgresJson', db: true do
-  before(:all) do
-    ActiveRecord::Schema.define do
-      create_table :posts, force: true do |t|
-        t.column :data, :jsonb
-      end
-    end
-
-    Post.reset_column_information
-
-    ActiveRecord::Base.connection.execute <<-SQL
-      CREATE INDEX index_posts_data_gin ON posts
-      USING  gin (data);
-    SQL
-
-    ActiveRecord::Base.connection.execute <<-SQL
-      CREATE OR REPLACE VIEW post_questions as
-      SELECT
-        id,
-        data ->> 'title'            AS title,
-        data #>> '{author,name}'    AS author_name,
-        data #>> '{author,email}'   AS author_email,
-        (data ->> 'tags')::jsonb     AS tags,
-        (data ->> 'draft')::boolean AS draft
-      FROM posts
-    SQL
-  end
-
   after(:all) do
-    ActiveRecord::Base.connection.execute 'DROP INDEX IF EXISTS index_posts_data_gin'
-    ActiveRecord::Base.connection.execute 'DROP VIEW IF EXISTS post_questions'
+    db_config = YAML.load_file(File.expand_path('../database.yml', __FILE__))
+    ActiveRecord::Base.connection.execute "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = 'mydb'"
+    ActiveRecord::Base.establish_connection(db_config['test'].merge('database' => 'postgres', 'schema_search_path' => 'public'))
+    ActiveRecord::Base.connection.execute 'DROP DATABASE IF EXISTS ar_postgres_json_test'
   end
 
   before { Post.delete_all }
@@ -100,4 +78,31 @@ describe 'ActiverecordPostgresJson', db: true do
   it 'when search in objects array' do
     expect(Post.where('data @> \'[{"f1":6}]\'').count).to eq(1)
   end
+
+  context 'when the column is of json type' do
+    let!(:plain_json) do
+      Post.create!(data: { title: 'Plain JSON support'},
+                   old_data: { title: 'Old JSON is supported too',
+                               author: { name: 'Aurel', email: 'aurel@example.com'},
+                               draft:  true }).reload
+    end
+
+    it 'process plain JSON columns, ' do
+      post = Post.all.to_a[4]
+
+      # Rails 4.0.x and 4.1.x will serialize plain json fields without symbolizing keys with their own serializer
+      if ActiveRecord.respond_to?(:version)
+        if ::ActiveRecord.version >= Gem::Version.new('4.0.0') && ::ActiveRecord.version < Gem::Version.new('4.2.0')
+            expect(post.old_data).to eq({ 'title' => 'Old JSON is supported too',
+                                          'author' => { 'name' => 'Aurel', 'email' => 'aurel@example.com'},
+                                          'draft' => true })
+        end
+        # Rails 3.2.x will serialize plain json fields symbolizing keys using this gem
+      elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+          expect(post.old_data).to eq({ title: 'Old JSON is supported too',
+                                        author: { name: 'Aurel', email: 'aurel@example.com'},
+                                        draft: true })
+      end
+    end
+  end
 end

data/spec/support/database_setup.rb

@@ -3,16 +3,37 @@ require 'pg'
 require 'yaml'
 
 db_config = YAML.load_file(File.expand_path('../../database.yml', __FILE__))
+structure_sql_filename = 'db/ar_postgre_json_test.sql'
 
 begin
   ActiveRecord::Base.establish_connection db_config['test']
   ActiveRecord::Base.connection.active?
-rescue Exception => e
+rescue Exception => _e
   encoding = db_config['test']['encoding'] || ENV['CHARSET'] || 'utf8'
   begin
     ActiveRecord::Base.establish_connection(db_config['test'].merge('database' => 'postgres', 'schema_search_path' => 'public'))
-    ActiveRecord::Base.connection.create_database(db_config['test']['database'], db_config['test'].merge('encoding' => encoding))
+    ActiveRecord::Base.connection.recreate_database(db_config['test']['database'], db_config['test'].merge('encoding' => encoding))
     ActiveRecord::Base.establish_connection(db_config['test'])
+
+    ActiveRecord::Base.configurations = db_config
+    if ActiveRecord.respond_to?(:version)
+      require 'active_record/tasks/database_tasks'
+
+      if ::ActiveRecord.version >= Gem::Version.new('4.1.0') && ::ActiveRecord.version < Gem::Version.new('4.2.0')
+        ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, structure_sql_filename, 'test')
+      elsif ::ActiveRecord.version >= Gem::Version.new('4.0.0') && ::ActiveRecord.version < Gem::Version.new('4.1.0')
+        ActiveRecord::Tasks::DatabaseTasks.structure_load(db_config['test'], structure_sql_filename)
+      end
+    elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+      require "active_record/base"
+      require "rake"
+      require "rake/dsl_definition"
+      load "active_record/railties/databases.rake"
+
+      set_psql_env(db_config)
+      `psql -f "#{structure_sql_filename}" #{db_config['test']['database']}`
+    end
+
   rescue Exception => ec
     $stderr.puts ec, *(ec.backtrace)
     $stderr.puts "Couldn't create database for #{db_config['test'].inspect}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-json
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Roman Shterenzon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -145,6 +145,7 @@ files:
 - Rakefile
 - VERSION
 - activerecord-postgres-json.gemspec
+- db/ar_postgre_json_test.sql
 - lib/activerecord-postgres-json.rb
 - lib/activerecord-postgres-json/activerecord.rb
 - lib/activerecord-postgres-json/coders.rb