activerecord-cte 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b0c6a6425bfa8f8b7137d7f3a96b84aa97c10f4d00b25c5a091890fef2de73
-  data.tar.gz: d6856b61cf2e747807af2baf843a41c3e667832a97183ff3db3867486c8e9d90
+  metadata.gz: fec64d2dc3623acd9cfb623957035c94ce160ac7f1f5bc8df2777d37e8e496b6
+  data.tar.gz: 12d66f36eb856b43a5e23568234884b81db258a67bbed86417e2f28d90449dce
 SHA512:
-  metadata.gz: 0c68905f134a9d8c4e52a21aa1ab278b4de60b00fc93d2acd6935f0a65d8699fa76f543e03f6d9885d1fb148bdd48f9d072d9c66a12d7cb988e158068cb678ed
-  data.tar.gz: 0c999b62136a17857046eeb384a9fc8090e9cf70d8e7fa06febdd663169994ce348c657cc414795e5f47fc73fb7325d6903e3f5ed202c124d2d832b8bed45b70
+  metadata.gz: 28a0be826ae1b0914f8fa4b9e7dd7d9f0221b67b453abfa9f680f943453f12a9436d756378059aade81e4341e352598309dc799441e063d8215c846a00df6ec0
+  data.tar.gz: 78839e99683a7ee08bae702361010986678e1f8a8eaa95e2508edf75188d359a6b3d3295630e4d2a7fb367214dc15d17df69c14a1b8d0d3970f2a5d3a35d49e7

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

@@ -6,7 +6,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.1.4, 6.0.4]
+        active_record: [6.1.7.2, 6.0.6, 5.2.8.1]
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
+        exclude:
+          - active_record: 5.2.8.1
+            ruby: '3.0'
+          - active_record: 5.2.8.1
+            ruby: 3.1
+          - active_record: 5.2.8.1
+            ruby: 3.2
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
       DATABASE_ADAPTER: mysql
@@ -20,6 +28,7 @@ jobs:
       - 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/.github/workflows/test-with-postgresql.yml

@@ -3,11 +3,19 @@ on: [pull_request]
 jobs:
   Test-With-PostgreSQL:
     runs-on: ubuntu-latest
-    container: ruby:3.0
+    container: ruby:${{ matrix.ruby }}
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.1.4, 6.0.4]
+        active_record: [6.1.7.2, 6.0.6, 5.2.8.1]
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
+        exclude:
+          - active_record: 5.2.8.1
+            ruby: '3.0'
+          - active_record: 5.2.8.1
+            ruby: 3.1
+          - active_record: 5.2.8.1
+            ruby: 3.2
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
       DATABASE_ADAPTER: postgresql
@@ -28,6 +36,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
+      - name: Update bundler
+        run: gem update bundler # Use the latest bundler
       - name: Bundle dependencies
         run: bundle install
       - name: Run tests

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

@@ -6,12 +6,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.1.4, 6.0.4, 5.2.6]
+        active_record: [6.1.7.2, 6.0.6, 5.2.8.1]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.6, 2.7, '3.0']
+        ruby: [2.6, 2.7, '3.0', 3.1, 3.2]
         exclude:
-          - active_record: 5.2.6
+          - active_record: 5.2.8.1
             ruby: '3.0'
+          - active_record: 5.2.8.1
+            ruby: 3.1
+          - active_record: 5.2.8.1
+            ruby: 3.2
 
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.2

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.1
 
 ENV APP_HOME /activerecord_cte
 RUN mkdir $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.1.4")
+ACTIVE_RECORD_VERSION = ENV.fetch("ACTIVE_RECORD_VERSION", "6.1.7.2")
 
 gem "activerecord", ACTIVE_RECORD_VERSION
 

data/bin/test

@@ -4,7 +4,7 @@
 require "English"
 require "yaml"
 
-active_record_versions = %w[6.1.4 6.0.4]
+active_record_versions = %w[6.1.7.2 6.0.6]
 database_adapters = %w[mysql postgresql sqlite3]
 
 class Matrix

data/lib/activerecord/cte/core_ext.rb

@@ -15,6 +15,7 @@ module ActiveRecord
     private
 
     def merge_withs
+      relation.recursive_with = true if other.recursive_with?
       other_values = other.with_values.reject { |value| relation.with_values.include?(value) }
       relation.with!(*other_values) if other_values.any?
     end
@@ -30,7 +31,12 @@ module ActiveRecord
     end
 
     def with!(opts, *rest)
-      self.with_values += [opts] + rest
+      if opts == :recursive
+        self.recursive_with = true
+        self.with_values += rest
+      else
+        self.with_values += [opts] + rest
+      end
       self
     end
 
@@ -44,6 +50,16 @@ module ActiveRecord
       @values[:with] = values
     end
 
+    def recursive_with?
+      @values[:recursive_with]
+    end
+
+    def recursive_with=(value)
+      raise ImmutableRelation if @loaded
+
+      @values[:recursive_with] = value
+    end
+
     private
 
     def build_arel(*args)
@@ -55,7 +71,6 @@ module ActiveRecord
     def build_with(arel) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
       return if with_values.empty?
 
-      recursive = with_values.delete(:recursive)
       with_statements = with_values.map do |with_value|
         case with_value
         when String then Arel::Nodes::SqlLiteral.new(with_value)
@@ -67,7 +82,7 @@ module ActiveRecord
         end
       end
 
-      recursive ? arel.with(:recursive, with_statements) : arel.with(with_statements)
+      recursive_with? ? arel.with(:recursive, with_statements) : arel.with(with_statements)
     end
 
     def build_with_value_from_array(array)

data/lib/activerecord/cte/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cte
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vlado Cingel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Brings Common Table Expressions support to ActiveRecord and makes it super