arel_toolkit 0.4.2 → 0.4.6

data/lib/arel/sql_to_arel/pg_query_visitor/frame_options.rb

@@ -42,7 +42,7 @@ module Arel
           # RANGE only unbounded
           # ROWS all
           # https://github.com/postgres/postgres/blob/REL_10_1/src/include/nodes/parsenodes.h
-          FRAMEOPTIONS = {
+          FRAMEOPTIONS_V10 = {
             'FRAMEOPTION_NONDEFAULT' => 0x00001,
             'FRAMEOPTION_RANGE' => 0x00002,
             'FRAMEOPTION_ROWS' => 0x00004,
@@ -59,6 +59,38 @@ module Arel
             'FRAMEOPTION_END_VALUE_FOLLOWING' => 0x02000,
           }.freeze
 
+          FRAMEOPTIONS_V11_AND_UP = {
+            'FRAMEOPTION_NONDEFAULT' => 0x00001, # any specified? */
+            'FRAMEOPTION_RANGE' => 0x00002, # RANGE behavior */
+            'FRAMEOPTION_ROWS' => 0x00004, # ROWS behavior */
+            'FRAMEOPTION_GROUPS' => 0x00008,  # GROUPS behavior */
+            'FRAMEOPTION_BETWEEN' => 0x00010, # BETWEEN given? */
+            'FRAMEOPTION_START_UNBOUNDED_PRECEDING' => 0x00020, # start is U. P. */
+            'FRAMEOPTION_END_UNBOUNDED_PRECEDING' => 0x00040, # (disallowed) */
+            'FRAMEOPTION_START_UNBOUNDED_FOLLOWING' => 0x00080, # (disallowed) */
+            'FRAMEOPTION_END_UNBOUNDED_FOLLOWING' => 0x00100, # end is U. F. */
+            'FRAMEOPTION_START_CURRENT_ROW' => 0x00200, # start is C. R. */
+            'FRAMEOPTION_END_CURRENT_ROW' => 0x00400, # end is C. R. */
+            'FRAMEOPTION_START_OFFSET_PRECEDING' => 0x00800, # start is O. P. */
+            'FRAMEOPTION_END_OFFSET_PRECEDING' => 0x01000, # end is O. P. */
+            'FRAMEOPTION_START_OFFSET_FOLLOWING' => 0x02000, # start is O. F. */
+            'FRAMEOPTION_END_OFFSET_FOLLOWING' => 0x04000, # end is O. F. */
+            'FRAMEOPTION_EXCLUDE_CURRENT_ROW' => 0x08000, # omit C.R. */
+            'FRAMEOPTION_EXCLUDE_GROUP' => 0x10000, # omit C.R. & peers */
+            'FRAMEOPTION_EXCLUDE_TIES' => 0x20000, # omit C.R.'s peers */
+          }.freeze
+
+          def frameoptions
+            case PG.library_version.to_s[0, 2]
+            when '09', '10'
+              FRAMEOPTIONS_V10
+            when '11', '12', '13', '14'
+              FRAMEOPTIONS_V11_AND_UP
+            else
+              boom "Version #{PG.library_version.to_s[0, 2]} not supported"
+            end
+          end
+
           def biggest_detractable_number(number, candidates)
             high_to_low_candidates = candidates.sort { |a, b| b <=> a }
             high_to_low_candidates.find do |candidate|
@@ -69,8 +101,8 @@ module Arel
           def calculate_frame_option_names(frame_options, names = [])
             return names if frame_options.zero?
 
-            number = biggest_detractable_number(frame_options, FRAMEOPTIONS.values)
-            name = FRAMEOPTIONS.key(number)
+            number = biggest_detractable_number(frame_options, frameoptions.values)
+            name = frameoptions.key(number)
             calculate_frame_option_names(
               frame_options - number, names + [name]
             )
@@ -95,10 +127,10 @@ module Arel
             when 'CURRENT_ROW'
               Arel::Nodes::CurrentRow.new
 
-            when 'VALUE_PRECEDING'
+            when 'VALUE_PRECEDING', 'OFFSET_PRECEDING'
               Arel::Nodes::Preceding.new offset
 
-            when 'VALUE_FOLLOWING'
+            when 'VALUE_FOLLOWING', 'OFFSET_FOLLOWING'
               Arel::Nodes::Following.new offset
 
             else

data/lib/arel/transformer/prefix_schema_name.rb

@@ -119,17 +119,19 @@ module Arel
 
       # https://www.rubydoc.info/github/rubyworks/facets/String:unquote
       def unquote_string(string)
+        s = string.dup
+
         case string[0, 1]
         when "'", '"', '`'
-          string[0] = ''
+          s[0] = ''
         end
 
         case string[-1, 1]
         when "'", '"', '`'
-          string[-1] = ''
+          s[-1] = ''
         end
 
-        string
+        s
       end
 
       def database_object_mapping

data/lib/arel_toolkit.rb

@@ -5,6 +5,7 @@ require 'pg_search' if Gem.loaded_specs.key?('pg_search')
 require 'rails/railtie' if Gem.loaded_specs.key?('railties')
 require 'arel'
 require 'active_record'
+require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'arel_toolkit/version'
 

data/lib/arel_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ArelToolkit
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.6'.freeze
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: arel_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - maarten
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 9.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -414,12 +406,13 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/workflows/develop.yml"
-- ".github/workflows/master.yml"
+- ".github/workflows/coverage.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".tool-versions"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -433,10 +426,13 @@ files:
 - benchmark.rb
 - bin/console
 - bin/setup
+- docker-compose.yml
 - ext/pg_result_init/extconf.rb
 - ext/pg_result_init/pg_result_init.c
 - ext/pg_result_init/pg_result_init.h
 - gemfiles/.bundle/config
+- gemfiles/active_record_6.gemfile
+- gemfiles/active_record_6.gemfile.lock
 - gemfiles/arel_gems.gemfile
 - gemfiles/arel_gems.gemfile.lock
 - gemfiles/default.gemfile
@@ -548,6 +544,7 @@ files:
 - lib/arel/extensions/table.rb
 - lib/arel/extensions/time_with_precision.rb
 - lib/arel/extensions/to_sql.rb
+- lib/arel/extensions/top.rb
 - lib/arel/extensions/transaction.rb
 - lib/arel/extensions/tree_manager.rb
 - lib/arel/extensions/trim.rb
@@ -565,8 +562,10 @@ files:
 - lib/arel/extensions/with_ordinality.rb
 - lib/arel/middleware.rb
 - lib/arel/middleware/active_record_extension.rb
+- lib/arel/middleware/cache_accessor.rb
 - lib/arel/middleware/chain.rb
 - lib/arel/middleware/database_executor.rb
+- lib/arel/middleware/no_op_cache.rb
 - lib/arel/middleware/postgresql_adapter.rb
 - lib/arel/middleware/railtie.rb
 - lib/arel/middleware/result.rb
@@ -587,7 +586,7 @@ homepage: https://github.com/mvgijssel/arel_toolkit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -602,8 +601,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Collection of tools for Arel
 test_files: []

data/.github/workflows/develop.yml

@@ -1,88 +0,0 @@
-name: CI - develop
-on:
-  push:
-    branches-ignore:
-      - master
-
-jobs:
-  rspec:
-    name: RSpec - ${{ matrix.title }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        checkout: [branch, master]
-        include:
-          - checkout: branch
-            ref: null
-            title: current branch
-            rebase: false
-            codeclimate: true
-          - checkout: master
-            ref: master
-            title: merge with master
-            rebase: true
-            codeclimate: false
-
-    services:
-      postgres:
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        image: postgres:10.10
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: arel_toolkit_test
-          POSTGRES_USER: postgres
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        ref: ${{ matrix.ref }}
-
-    # Based on
-    # https://discourse.drone.io/t/planned-change-to-git-clone-logic/1165
-    - name: Rebase
-      if: matrix.rebase
-      run: |
-        git config --global user.email "ci@github.com"
-        git config --global user.name "GitHub CI"
-        git fetch origin $GITHUB_REF
-        git rebase $GITHUB_SHA
-
-    - name: Set up Ruby 2.5.x
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.5.x
-
-    - name: Setup
-      run: |
-        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-        chmod +x ./cc-test-reporter
-        ./cc-test-reporter before-build
-
-        sudo apt-get install -y libpq-dev
-
-        gem install bundler
-
-        bundle install --jobs 4 --retry 3
-        bundle exec appraisal install
-
-        bundle exec rake clean
-        bundle exec rake compile
-
-    - name: RSpec
-      run: |
-        bundle exec appraisal rspec --force-color
-
-    - name: Report to codeclimate
-      if: always() && matrix.codeclimate
-      shell: bash
-      env:
-        JOB_STATUS: ${{ job.status == 'Success' }}
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      run: |
-        EXIT_CODE=$([[ "$JOB_STATUS" == true ]] && echo 0 || echo 1)
-        ./cc-test-reporter after-build --exit-code $EXIT_CODE

data/.github/workflows/master.yml

@@ -1,67 +0,0 @@
-name: CI - master
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  rspec:
-    name: RSpec - master
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        image: postgres:10.10
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: arel_toolkit_test
-          POSTGRES_USER: postgres
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Ruby 2.5.x
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.5.x
-
-    - name: Setup
-      run: |
-        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-        chmod +x ./cc-test-reporter
-        ./cc-test-reporter before-build
-
-        sudo apt-get install -y libpq-dev
-
-        gem install bundler
-
-        bundle install --jobs 4 --retry 3
-        bundle exec appraisal install
-
-        bundle exec rake clean
-        bundle exec rake compile
-
-    - name: RSpec
-      run: |
-        bundle exec appraisal rspec --force-color
-
-    - name: Report to codeclimate
-      if: always()
-      shell: bash
-      env:
-        JOB_STATUS: ${{ job.status == 'Success' }}
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      run: |
-        EXIT_CODE=$([[ "$JOB_STATUS" == true ]] && echo 0 || echo 1)
-        ./cc-test-reporter after-build --exit-code $EXIT_CODE
-
-    - name: Upload coverage to GitHub pages
-      uses: maxheld83/ghpages@v0.2.1
-      env:
-        BUILD_DIR: ./coverage
-        GH_PAT: ${{ secrets.GH_PAT }}