arel_toolkit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71faaa5416ecd1e04fec3cbeb1ea22104738027adc65941630c5b3e98b87a666
-  data.tar.gz: 15484e5f9677367fcd82291d29bd2a0f09c2d56634af5880f78e0f2cca532b55
+  metadata.gz: 12a7a7083cd421854ed6034a0a1cbf83352439d843d7414225267599e9d5a0af
+  data.tar.gz: db2a316896694e49edce2ee52aab4f2283781e45347acaea23fac1fd5dbbf5a9
 SHA512:
-  metadata.gz: b452f4200412105997f2d68d22febe6d98fec579b734bf09aa9a3c1408b25e3d1fe744f8eb7a24bccaf8b3969afc05d1a04eccc8d194e6e7cabb39c5ab3ec74f
-  data.tar.gz: 37f3fdc0e2612ab325247861b159c8621c66b46e07267b4c5d9e34eff19c3068117165c5a1adb803c086d144fd325bb813e67ff73370d925bf9bf283e2ff602e
+  metadata.gz: 1b77b18061a8332e5e6aa9fe0288fb2526309604f17eb3751d0c363ea1349aaa158fad5106fee32e0a3064cbc21615e1930dd0e59012b92648e75a96cc488190
+  data.tar.gz: 5b04edcfc25b94cb44ac93d4c7472bc7e4d380c20a1d750c41f56e52b754cb0e023b5758e8c35dd2477037e6ff9ca0d2b0aaf5dc7825063fa5b053be7142c142

data/.rubocop.yml

@@ -7,6 +7,9 @@ Bundler/OrderedGems:
 Gemspec/OrderedDependencies:
   Enabled: false
 
+Style/MultilineBlockChain:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: true
   Max: 100

data/.travis.yml

@@ -19,3 +19,11 @@ script:
   - bundle exec rspec spec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN
+  local_dir: ./coverage
+  keep_history: true
+  on:
+    branch: master

data/CHANGELOG.md

@@ -1,10 +1,59 @@
-# Changelog
+# Change Log
 
-## 0.2.0 (31st of May 2019)
+## [v0.3.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.3.0) (2019-07-01)
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.2.0...v0.3.0)
 
-### New features
+**Implemented enhancements:**
 
-- Support generating Arel::InsertManager from PostgresQL INSERT statements
-- Support generating Arel::SelectManager from PostgresQL SELECT statements
-- Support generating Arel::UpdateManager from PostgresQL UPDATE statements
-- Support generating Arel::DeleteManager from PostgresQL DELETE statements
+- Implement Functions and Operators from PostgreSQL docs [\#84](https://github.com/mvgijssel/arel_toolkit/issues/84)
+- Implement more missing operators and visitors [\#82](https://github.com/mvgijssel/arel_toolkit/issues/82)
+- Improve error message when unable to parse sql to arel [\#71](https://github.com/mvgijssel/arel_toolkit/issues/71)
+- Publish coverage information to GitHub pages [\#64](https://github.com/mvgijssel/arel_toolkit/issues/64)
+- Add ActiveRecord comparison testing [\#61](https://github.com/mvgijssel/arel_toolkit/issues/61)
+- Make Arel::TreeManager equal to other trees [\#59](https://github.com/mvgijssel/arel_toolkit/issues/59)
+- Add support for Arel.middleware [\#52](https://github.com/mvgijssel/arel_toolkit/issues/52)
+- Handle multiple tree entries in pg\_query\_visitor\#accept [\#33](https://github.com/mvgijssel/arel_toolkit/issues/33)
+
+**Fixed bugs:**
+
+- Fix invalid generated SQL, add missing visitors and extend operators [\#79](https://github.com/mvgijssel/arel_toolkit/issues/79)
+- Fix handling of equality with Arel::Nodes::Quoted [\#77](https://github.com/mvgijssel/arel_toolkit/issues/77)
+- Fix default values for Delete- and UpdateStatement [\#75](https://github.com/mvgijssel/arel_toolkit/issues/75)
+- Unknown operator `` for IN statement [\#73](https://github.com/mvgijssel/arel_toolkit/issues/73)
+- NameError: undefined local variable or method `number' for \#\<Arel::SqlToArel::PgQueryVisitor:0x000055dfdd14c6f8\> [\#69](https://github.com/mvgijssel/arel_toolkit/issues/69)
+- Make compatible with postgres\_ext [\#67](https://github.com/mvgijssel/arel_toolkit/issues/67)
+
+**Closed issues:**
+
+- File issues for commented out rspec test [\#51](https://github.com/mvgijssel/arel_toolkit/issues/51)
+
+## [v0.2.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.2.0) (2019-05-30)
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.1.0...v0.2.0)
+
+**Implemented enhancements:**
+
+- Handle op in pg\_query\_visitor\#visit\_SelectStmt [\#38](https://github.com/mvgijssel/arel_toolkit/issues/38)
+- Add WITH, OVERRIDING and RETURNING to INSERT [\#28](https://github.com/mvgijssel/arel_toolkit/issues/28)
+- Return \(Select|Update|Insert|Delete\)Manager instead of \(Select|Update|Insert|Delete\)Statement [\#25](https://github.com/mvgijssel/arel_toolkit/issues/25)
+- Implement UNION in sql\_to\_arel [\#24](https://github.com/mvgijssel/arel_toolkit/issues/24)
+- Extract Arel extensions to their own files [\#23](https://github.com/mvgijssel/arel_toolkit/issues/23)
+- Implement pg\_query\_visitor method for DELETE [\#22](https://github.com/mvgijssel/arel_toolkit/issues/22)
+- Implement pg\_query\_visitor method for INSERT [\#21](https://github.com/mvgijssel/arel_toolkit/issues/21)
+- Implement pg\_query\_visitor method for UPDATE [\#20](https://github.com/mvgijssel/arel_toolkit/issues/20)
+- Implement all the visitor methods in PgQueryVisitor for SELECT statements [\#11](https://github.com/mvgijssel/arel_toolkit/issues/11)
+- Introduce Guard [\#5](https://github.com/mvgijssel/arel_toolkit/issues/5)
+
+**Fixed bugs:**
+
+- Fix CodeClimate coverage [\#8](https://github.com/mvgijssel/arel_toolkit/issues/8)
+
+**Closed issues:**
+
+- Create issues for unknown branches in pg\_query\_visitor [\#19](https://github.com/mvgijssel/arel_toolkit/issues/19)
+- Remove unnecessary to\_arel remains [\#15](https://github.com/mvgijssel/arel_toolkit/issues/15)
+- Merge to\_arel gem [\#4](https://github.com/mvgijssel/arel_toolkit/issues/4)
+
+## [v0.1.0](https://github.com/mvgijssel/arel_toolkit/tree/v0.1.0) (2019-05-16)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile.lock

@@ -1,24 +1,54 @@
 PATH
   remote: .
   specs:
-    arel_toolkit (0.2.0)
+    arel_toolkit (0.3.0)
+      activerecord (~> 5.2.0)
       arel (~> 9.0.0)
+      pg (~> 1.1.4)
       pg_query (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     arel (9.0.0)
     ast (2.4.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.3.1)
+    dpl (1.10.11)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
     ffi (1.11.1)
     formatador (0.2.5)
+    github_changelog_generator (1.14.3)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (~> 2.1)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -33,7 +63,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
     hirb (0.7.3)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
     interception (0.5)
     jaro_winkler (1.5.2)
     json (2.2.0)
@@ -43,13 +78,19 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
+    pg (1.1.4)
     pg_query (1.1.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -65,11 +106,13 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
+    public_suffix (3.1.1)
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    retriable (2.1.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -92,6 +135,9 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     shellany (0.0.1)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -103,6 +149,9 @@ GEM
       simplecov
     simplecov-html (0.10.2)
     thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
 
 PLATFORMS
@@ -111,8 +160,12 @@ PLATFORMS
 DEPENDENCIES
   arel_toolkit!
   bundler (~> 2.0)
+  database_cleaner (~> 1.7.0)
+  dpl (~> 1.10.11)
+  github_changelog_generator (~> 1.14.3)
   guard (~> 2.15)
   guard-rspec (~> 4.7)
+  guard-rubocop (~> 1.3.0)
   pry
   pry-alias
   pry-nav

data/Guardfile

@@ -24,19 +24,26 @@
 #  * zeus: 'zeus rspec' (requires the server to be started separately)
 #  * 'just' rspec: 'rspec'
 
-guard :rspec, cmd: 'bundle exec rspec', failed_mode: :focus do
-  require 'guard/rspec/dsl'
-  dsl = Guard::RSpec::Dsl.new(self)
+group :red_green_refactor, halt_on_fail: true do
+  guard :rspec, cmd: 'bundle exec rspec', failed_mode: :focus do
+    require 'guard/rspec/dsl'
+    dsl = Guard::RSpec::Dsl.new(self)
 
-  # Feel free to open issues for suggestions and improvements
+    # Feel free to open issues for suggestions and improvements
 
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
+    # RSpec files
+    rspec = dsl.rspec
+    watch(rspec.spec_helper) { rspec.spec_dir }
+    watch(rspec.spec_support) { rspec.spec_dir }
+    watch(rspec.spec_files)
 
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
+    # Ruby files
+    ruby = dsl.ruby
+    dsl.watch_spec_files_for(ruby.lib_files)
+  end
+
+  guard :rubocop do
+    watch(/.+\.rb$/)
+    watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end

data/README.md

@@ -9,6 +9,7 @@
 - [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 - ![](http://ruby-gem-downloads-badge.herokuapp.com/arel_toolkit?type=total)
 - ![](http://ruby-gem-downloads-badge.herokuapp.com/arel_toolkit?label=downloads-current-version)
+- [Coverage report](https://mvgijssel.github.io/arel_toolkit/)
 
 ## Installation
 
@@ -28,7 +29,7 @@ Or install it yourself as:
 
 ## sql_to_arel
 
-Convert your (PostgreSQL) SQL into Arel.
+Convert your (PostgreSQL) SQL into an Arel AST.
 
 ```ruby
 [1] > sql = 'SELECT id FROM users'
@@ -41,7 +42,60 @@ Convert your (PostgreSQL) SQL into Arel.
 
 ## Extensions
 
-Adds some missing Arel nodes and extends the existing visitors.
+Adds missing Arel nodes and extends the existing visitors, [lib/arel/extensions](https://github.com/mvgijssel/arel_toolkit/tree/master/lib/arel/extensions) for a full list.
+
+## Middleware
+
+The middleware sits between ActiveRecord and the database, which allows you to mutate or log queries before they hit the database. Multiple middleware are supported by passing the results from a finished middleware to the next. User defined context will be passed, which can contains things like the `current_user_id`.
+
+### Example
+
+Create an initializer in Rails which loads the Arel::Middleware **after** ActiveRecord:
+
+```ruby
+ActiveSupport.on_load :active_record do
+  Arel::Middleware::Railtie.insert_postgresql
+end
+```
+
+Create some middleware (can be any Ruby object which responds to `call`):
+
+```ruby
+class ReorderMiddleware
+  def self.call(arel, _context)
+    arel.order(Post.arel_table[:id].asc)
+  end
+end
+
+class LoggingMiddleware
+  def self.call(arel, context)
+    puts "User executing query: `#{context[:current_user_id]}`"
+    puts "Original SQL: `#{context[:original_sql]}`"
+    puts "Modified SQL: `#{arel.to_sql}`"
+    arel
+  end
+end
+```
+
+Run a query with middleware applied
+
+```ruby
+[1] > Arel.middleware.apply([ReorderMiddleware, LoggingMiddleware]).context(current_user_id: 1) { Post.all.load }
+User executing query: `1`
+Original SQL: `SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC`
+Modified SQL: `SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC, "posts"."id" ASC`
+Post Load (4.1ms)  SELECT "posts".* FROM "posts" ORDER BY "posts"."id" DESC, "posts"."id" ASC
+=> []
+```
+
+There are more methods available to help with ordering and modifying of the current applied middleware:
+
+- `Arel.middleware.apply([SomeMiddleware]) { ... }`
+- `Arel.middleware.only([OnlyMe]) { ... }`
+- `Arel.middleware.none { ... }`
+- `Arel.middleware.except(RemoveMe) { ... }`
+- `Arel.middleware.insert_before(RunBefore, ThisMiddleware) { ... }`
+- `Arel.middleware.insert_after(RunAfter, ThisMiddleware) { ... }`
 
 ## Development
 

data/Rakefile

@@ -1,6 +1,14 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'github_changelog_generator/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user = 'mvgijssel'
+  config.project = 'arel_toolkit'
+  config.future_release = "v#{ArelToolkit::VERSION}"
+  config.pulls = false
+end

data/arel_toolkit.gemspec

@@ -25,17 +25,23 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'arel', '~> 9.0.0'
+  spec.add_dependency 'activerecord', '~> 5.2.0'
+  spec.add_dependency 'pg', '~> 1.1.4'
   spec.add_dependency 'pg_query', '~> 1.1.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'dpl', '~> 1.10.11'
+  spec.add_development_dependency 'github_changelog_generator', '~> 1.14.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'database_cleaner', '~> 1.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
 
   spec.add_development_dependency 'rubocop', '~> 0.69'
   spec.add_development_dependency 'guard', '~> 2.15'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'guard-rubocop', '~> 1.3.0'
 
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'

data/bin/console

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'arel_toolkit'
+require_relative '../spec/support/active_record'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/arel/extensions/assignment.rb

@@ -0,0 +1,22 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+module Arel
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_Assignment(o, collector)
+        collector = visit o.left, collector
+        collector << ' = '
+
+        case o.right
+        when Arel::Nodes::Node, Arel::Attributes::Attribute
+          visit o.right, collector
+        else
+          collector << quote(o.right).to_s
+        end
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/at_time_zone.rb

@@ -0,0 +1,30 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.2/functions-datetime.html#FUNCTIONS-DATETIME-ZONECONVERT
+    class AtTimeZone < Arel::Nodes::Unary
+      attr_reader :timezone
+
+      def initialize(expr, timezone)
+        super(expr)
+
+        @timezone = timezone
+      end
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_AtTimeZone(o, collector)
+        visit o.expr, collector
+        collector << ' AT TIME ZONE '
+        visit o.timezone, collector
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/contained_within_equals.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.3/functions-net.html
+    class ContainedWithinEquals < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'<<=', left, right)
+      end
+    end
+  end
+end

data/lib/arel/extensions/contains.rb

@@ -1,9 +1,9 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/9.1/functions-array.html
-    class Contains < InfixOperation
+    class Contains < Arel::Nodes::InfixOperation
       def initialize(left, right)
-        super('@>', left, right)
+        super(:'@>', left, right)
       end
     end
   end

data/lib/arel/extensions/contains_equals.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.3/functions-net.html
+    class ContainsEquals < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'>>=', left, right)
+      end
+    end
+  end
+end

data/lib/arel/extensions/delete_manager.rb

@@ -0,0 +1,9 @@
+Arel::DeleteManager.class_eval do
+  def ==(other)
+    @ast == other.ast && @ctx == other.ctx
+  end
+
+  protected
+
+  attr_reader :ctx
+end

data/lib/arel/extensions/delete_statement.rb

@@ -8,6 +8,13 @@ module Arel
       attr_accessor :using
       attr_accessor :with
       attr_accessor :returning
+
+      alias_method :old_initialize, :initialize
+      def initialize(relation = nil, wheres = [])
+        old_initialize(relation, wheres)
+
+        @returning = []
+      end
     end
   end
 

data/lib/arel/extensions/distinct_from.rb

@@ -1,22 +1,9 @@
-# rubocop:disable Naming/MethodName
-# rubocop:disable Naming/UncommunicativeMethodParamName
-
 module Arel
   module Nodes
-    class DistinctFrom < Arel::Nodes::Binary
-    end
-  end
-
-  module Visitors
-    class ToSql
-      def visit_Arel_Nodes_DistinctFrom(o, collector)
-        visit o.left, collector
-        collector << ' IS DISTINCT FROM '
-        visit o.right, collector
+    class DistinctFrom < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'IS DISTINCT FROM', left, right)
       end
     end
   end
 end
-
-# rubocop:enable Naming/MethodName
-# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/equality.rb

@@ -6,15 +6,13 @@ module Arel
     class ToSql
       def visit_Arel_Nodes_Equality(o, collector)
         right = o.right
-
         collector = visit o.left, collector
 
-        case right
-        when Arel::Nodes::Unknown, Arel::Nodes::False, Arel::Nodes::True
+        if [Arel::Nodes::Unknown, Arel::Nodes::False, Arel::Nodes::True].include?(right.class)
           collector << ' IS '
           visit right, collector
 
-        when NilClass
+        elsif right.nil?
           collector << ' IS NULL'
 
         else

data/lib/arel/extensions/extract_from.rb

@@ -0,0 +1,32 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.1/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
+    class ExtractFrom < Arel::Nodes::Unary
+      attr_reader :field
+
+      def initialize(expr, field)
+        super(expr)
+
+        @field = field
+      end
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_ExtractFrom(o, collector)
+        collector << 'extract('
+        visit o.field, collector
+        collector << ' from '
+        visit o.expr, collector
+        collector << ')'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/insert_manager.rb

@@ -0,0 +1,5 @@
+Arel::InsertManager.class_eval do
+  def ==(other)
+    @ast == other.ast
+  end
+end

data/lib/arel/extensions/insert_statement.rb

@@ -6,9 +6,16 @@ module Arel
     # https://www.postgresql.org/docs/9.5/sql-insert.html
     Arel::Nodes::InsertStatement.class_eval do
       attr_accessor :with
-      attr_accessor :on_conflict
+      attr_accessor :conflict
       attr_accessor :override
       attr_accessor :returning
+
+      alias_method :old_initialize, :initialize
+      def initialize
+        old_initialize
+
+        @returning = []
+      end
     end
   end
 
@@ -32,7 +39,7 @@ module Arel
         end
 
         case o.override
-        when 0
+        when nil, 0
           collector << ''
         when 1
           collector << ' OVERRIDING USER VALUE'
@@ -55,7 +62,7 @@ module Arel
           collector = inject_join o.returning, collector, ', '
         end
 
-        visit(o.on_conflict, collector) if o.on_conflict
+        visit(o.conflict, collector) if o.conflict
         collector
       end
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/arel/extensions/json_get_field.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.4/functions-json.html#FUNCTIONS-JSON-OP-TABLE
+    class JsonGetField < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'->>', left, right)
+      end
+    end
+  end
+end

data/lib/arel/extensions/json_get_object.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.4/functions-json.html#FUNCTIONS-JSON-OP-TABLE
+    class JsonGetObject < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'->', left, right)
+      end
+    end
+  end
+end