activerecord-cte 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99aec3bf8a3947e2c887a63ca0b2d689987774c0af840b333217a87e5b9d94df
-  data.tar.gz: dac179b4c433590c7b20c6062361e827de39c62aae2c6aae61304b9e9ffaca04
+  metadata.gz: 24b0c6a6425bfa8f8b7137d7f3a96b84aa97c10f4d00b25c5a091890fef2de73
+  data.tar.gz: d6856b61cf2e747807af2baf843a41c3e667832a97183ff3db3867486c8e9d90
 SHA512:
-  metadata.gz: 2e7d6031d0ecab21c7b7b80e265b4397155f4ac0ae9aa40e70cc800a9ad3631889a303418ac17b9d7f21076682c045ed750d1b1c34b8d801ff4ad59d33cfefee
-  data.tar.gz: 239f8aba0becd85787d49ed1b6a4102e94a3e5b77d375591cddc5df98bd5bd307c2828eb900cc8d056ba71a4f57d4b193aa924330d2bf8c3b6af3c37f6017cef
+  metadata.gz: 0c68905f134a9d8c4e52a21aa1ab278b4de60b00fc93d2acd6935f0a65d8699fa76f543e03f6d9885d1fb148bdd48f9d072d9c66a12d7cb988e158068cb678ed
+  data.tar.gz: 0c999b62136a17857046eeb384a9fc8090e9cf70d8e7fa06febdd663169994ce348c657cc414795e5f47fc73fb7325d6903e3f5ed202c124d2d832b8bed45b70

data/.github/workflows/rubocop.yml

@@ -0,0 +1,12 @@
+name: Rubocop
+on: [pull_request]
+jobs:
+  Rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+      - run: bundle install
+      - run: bundle exec rubocop

data/.github/workflows/test-with-mysql.yml

@@ -0,0 +1,25 @@
+name: MySql
+on: [pull_request]
+jobs:
+  Test-With-Mysql:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        active_record: [6.1.4, 6.0.4]
+    env:
+      ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
+      DATABASE_ADAPTER: mysql
+      INSTALL_MYSQL_GEM: true
+      RAILS_ENV: test
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Start mysql
+        run: sudo service mysql start
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake test

data/.github/workflows/test-with-postgresql.yml

@@ -0,0 +1,34 @@
+name: PostgreSQL
+on: [pull_request]
+jobs:
+  Test-With-PostgreSQL:
+    runs-on: ubuntu-latest
+    container: ruby:3.0
+    strategy:
+      fail-fast: false
+      matrix:
+        active_record: [6.1.4, 6.0.4]
+    env:
+      ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
+      DATABASE_ADAPTER: postgresql
+      INSTALL_PG_GEM: true
+      RAILS_ENV: test
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Bundle dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake test

data/.github/workflows/test-with-sqlite.yml

@@ -0,0 +1,29 @@
+name: SQLite
+on: [pull_request]
+jobs:
+  Test-With-SQLite:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        active_record: [6.1.4, 6.0.4, 5.2.6]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.6, 2.7, '3.0']
+        exclude:
+          - active_record: 5.2.6
+            ruby: '3.0'
+
+    env:
+      ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
+      DATABASE_ADAPTER: sqlite3
+      RAILS_ENV: test
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake test

data/.rubocop.yml

@@ -1,8 +1,14 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: enable
+  TargetRubyVersion: 2.7
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
 
 Layout/LineLength:
   AllowHeredoc: true
@@ -10,15 +16,30 @@ Layout/LineLength:
   IgnoreCopDirectives: true
   Max: 120
   Exclude:
+    - "activerecord-cte.gemspec"
     - "test/**/*"
 
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
 Metrics/AbcSize:
   Exclude:
-    - "test/**/*"
+    - "test/**/*_test.rb"
+
+Metrics/ClassLength:
+  Exclude:
+    - "test/**/*_test.rb"
 
 Metrics/CyclomaticComplexity:
   Max: 7
 
+Metrics/MethodLength:
+  Exclude:
+    - "test/**/*_test.rb"
+
+Minitest/MultipleAssertions:
+  Max: 5
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:3.0
 
 ENV APP_HOME /activerecord_cte
 RUN mkdir $APP_HOME
@@ -7,6 +7,7 @@ WORKDIR $APP_HOME
 ENV RAILS_ENV test
 ENV INSTALL_MYSQL_GEM true
 ENV INSTALL_PG_GEM true
+ENV MYSQL_HOST mysql
 
 # Cache the bundle install
 COPY Gemfile* $APP_HOME/

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in activerecord-cte.gemspec
 gemspec
 
-ACTIVE_RECORD_VERSION = ENV.fetch("ACTIVE_RECORD_VERSION") { "6.0.2.1" }
+ACTIVE_RECORD_VERSION = ENV.fetch("ACTIVE_RECORD_VERSION", "6.1.4")
 
 gem "activerecord", ACTIVE_RECORD_VERSION
 

data/README.md

@@ -1,6 +1,11 @@
 # ActiveRecord::Cte
 
-Adds Common Table Expression support to ActiveRecord (Rails).
+![Rubocop](https://github.com/vlado/activerecord-cte/actions/workflows/rubocop.yml/badge.svg)
+![MySQL](https://github.com/vlado/activerecord-cte/actions/workflows/test-with-mysql.yml/badge.svg)
+![PostgreSQL](https://github.com/vlado/activerecord-cte/actions/workflows/test-with-postgresql.yml/badge.svg)
+![SQLite](https://github.com/vlado/activerecord-cte/actions/workflows/test-with-sqlite.yml/badge.svg)
+
+Adds [Common Table Expression](https://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL#Common_table_expression) support to ActiveRecord (Rails).
 
 It adds `.with` query method and makes it super easy to build and chain complex CTE queries. Let's explain it using simple example.
 
@@ -22,6 +27,8 @@ WITH posts_with_comments AS (
 SELECT * FROM posts
 ```
 
+**Please note that this creates the expressions but is not using them yet. See [Taking it further](#taking-it-further) for more info.**
+
 Without this gem you would need to use `Arel` directly.
 
 ```ruby
@@ -196,11 +203,27 @@ I decided to wait a bit :)
 
 After checking out the repo, run `bin/setup` to install dependencies.
 
+### Running Rubocop
+
+```
+bundle exec rubocop
+```
+
 ### Running tests
 
-Run `rake test` to run the tests using SQLite adapter and latest version on Rails.
+To run the tests using SQLite adapter and latest version on Rails run
+
+```
+bundle exec rake test
+```
+
+GitHub Actions will run the test matrix with multiple ActiveRecord versions and database adapters. You can also run the matrix locally with
+
+```
+bundle exec rake test:matrix
+```
 
-To run tests using all supportted database adapters and ActiveRecord versions run `rake test:matrix`. This will build Docker image with all dependencies and run alll tests in it. See `bin/test` for more info.
+This will build Docker image with all dependencies and run all tests in it. See `bin/test` for more info.
 
 ### Console
 
@@ -212,7 +235,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/activerecord-cte. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/vlado/activerecord-cte. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -220,4 +243,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Activerecord::Cte project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/activerecord-cte/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Activerecord::Cte project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/vlado/activerecord-cte/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -12,7 +12,10 @@ end
 task default: :test
 
 namespace :test do
+  desc "Will run the tests in all db adapters - AR version combinations"
   task :matrix do
+    require "English"
     system("docker-compose build && docker-compose run lib bin/test")
+    exit($CHILD_STATUS.exitstatus) unless $CHILD_STATUS.success?
   end
 end

data/activerecord-cte.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["vladocingel@gmail.com"]
 
   spec.summary       = "Brings Common Table Expressions support to ActiveRecord and makes it super easy to build and chain complex CTE queries"
+  spec.description   = spec.summary
   spec.homepage      = "https://github.com/vlado/activerecord-cte"
   spec.license       = "MIT"
 
@@ -19,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/vlado/activerecord-cte"
 
+  spec.required_ruby_version = ">= 1.9.2"
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -33,7 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake", "~> 13.0.1"
-  spec.add_development_dependency "rubocop", "~> 0.80.1"
-  spec.add_development_dependency "rubocop-performance", "~> 1.5.2"
+  spec.add_development_dependency "rubocop", "~> 1.17.0"
+  spec.add_development_dependency "rubocop-minitest", "~> 0.13.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.11.3"
+  spec.add_development_dependency "rubocop-rake", "~> 0.5.1"
   spec.add_development_dependency "sqlite3"
 end

data/bin/test

@@ -1,26 +1,46 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ADAPTERS = %w[
-  mysql
-  postgresql
-  sqlite3
-]
-AR_VERSIONS = %w[
-  6.0.2.1
-  5.2.4.1
-]
-
-ORIGINAL_AR_VERSION = `bundle show activerecord`.split("-").last.strip
-
-AR_VERSIONS.each do |ar_version|
-  puts "----> Running tests with ActiveRecord #{ar_version}"
-  system("ACTIVE_RECORD_VERSION=#{ar_version} bundle update activerecord") unless ar_version == ORIGINAL_AR_VERSION
-  ADAPTERS.each do |adapter|
-    puts "----> Running tests with #{adapter} adapter"
-    system("DATABASE_ADAPTER=#{adapter} ACTIVE_RECORD_VERSION=#{ar_version} bundle exec rake")
+require "English"
+require "yaml"
+
+active_record_versions = %w[6.1.4 6.0.4]
+database_adapters = %w[mysql postgresql sqlite3]
+
+class Matrix
+  def initialize(active_record_versions, database_adapters)
+    @active_record_versions = active_record_versions
+    @database_adapters = database_adapters
+    @exit_status_code = 0
+  end
+
+  def run
+    original_ar_version = `bundle show activerecord`.split("-").last.strip
+    @active_record_versions.each do |ar_version|
+      run_with_active_record_version(ar_version)
+    end
+    puts "----> Reverting back to original ActiveRecord version (#{original_ar_version})"
+    cmd("ACTIVE_RECORD_VERSION=#{original_ar_version} bundle update")
+
+    exit(@exit_status_code) unless @exit_status_code.zero?
+  end
+
+  private
+
+  def cmd(cmd)
+    system(cmd)
+    @exit_status_code = $CHILD_STATUS.exitstatus unless $CHILD_STATUS.success?
+  end
+
+  def run_with_active_record_version(ar_version)
+    puts "----> Switching ActiveRecord to version #{ar_version}"
+    cmd("ACTIVE_RECORD_VERSION=#{ar_version} bundle update")
+
+    @database_adapters.each do |adapter|
+      puts "----> Running tests with ActiveRecord #{ar_version} and #{adapter} adapter"
+      cmd("DATABASE_ADAPTER=#{adapter} ACTIVE_RECORD_VERSION=#{ar_version} bundle exec rake test")
+    end
   end
 end
 
-puts "----> Reverting back to original ActiveRecord version (#{ORIGINAL_AR_VERSION})"
-system("ACTIVE_RECORD_VERSION=#{ORIGINAL_AR_VERSION} bundle update activerecord")
+Matrix.new(active_record_versions.flatten.uniq, database_adapters.uniq).run

data/docker-compose.yml

@@ -15,9 +15,9 @@ services:
     restart: always
     environment:
       MYSQL_DATABASE: activerecord_cte_test
-      MYSQL_USER: user
-      MYSQL_PASSWORD: secret
-      MYSQL_ROOT_PASSWORD: secret
+      MYSQL_USER: root
+      MYSQL_PASSWORD: root
+      MYSQL_ROOT_PASSWORD: root
     ports:
       - 3306:3306
     expose:
@@ -28,8 +28,8 @@ services:
     restart: always
     environment:
       POSTGRES_DB: activerecord_cte_test
-      POSTGRES_USER: user
-      POSTGRES_PASSWORD: secret
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
       - 5432:5432
     expose:

data/lib/activerecord/cte/core_ext.rb

@@ -5,7 +5,26 @@ module ActiveRecord
     delegate :with, to: :all
   end
 
+  module WithMerger
+    def merge
+      super
+      merge_withs
+      relation
+    end
+
+    private
+
+    def merge_withs
+      other_values = other.with_values.reject { |value| relation.with_values.include?(value) }
+      relation.with!(*other_values) if other_values.any?
+    end
+  end
+
   class Relation
+    class Merger
+      prepend WithMerger
+    end
+
     def with(opts, *rest)
       spawn.with!(opts, *rest)
     end
@@ -27,13 +46,13 @@ module ActiveRecord
 
     private
 
-    def build_arel(aliases)
-      arel = super(aliases)
+    def build_arel(*args)
+      arel = super
       build_with(arel) if @values[:with]
       arel
     end
 
-    def build_with(arel) # rubocop:disable Metrics/MethodLength
+    def build_with(arel) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
       return if with_values.empty?
 
       recursive = with_values.delete(:recursive)

data/lib/activerecord/cte/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Cte
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cte
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vlado Cingel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,28 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.1
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.80.1
+        version: 1.17.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.11.3
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,15 +136,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Brings Common Table Expressions support to ActiveRecord and makes it
+  super easy to build and chain complex CTE queries
 email:
 - vladocingel@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test-with-mysql.yml"
+- ".github/workflows/test-with-postgresql.yml"
+- ".github/workflows/test-with-sqlite.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".vimrc"
 - CODE_OF_CONDUCT.md
@@ -140,7 +174,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/vlado/activerecord-cte
   source_code_uri: https://github.com/vlado/activerecord-cte
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,15 +182,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Brings Common Table Expressions support to ActiveRecord and makes it super
   easy to build and chain complex CTE queries