activerecord-cte 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5fd306f910ad7183f278dfbbf91363e7825a823f31fbb798693a8a529db23c
-  data.tar.gz: aa0dcc304d3469394b2e0eb6496ddfac22632df5febc0d43f71302fbbdbfe3d6
+  metadata.gz: fa6017d175139cbb92a4428130dc7ca14c10018a9a32d9c3dba0a6b68e41e348
+  data.tar.gz: 139a0430c0f9732e36de816475d9c3d8fc12bd326ef1349401549193112652f2
 SHA512:
-  metadata.gz: c13b4cb8fe44d0380856fbac382f27f9881d03dcb6d9c6fb21d0cb1c5d2704d09d0e51432b165816f939d1ce46957d877ffc84bdeda837d20604d78065ccfa4b
-  data.tar.gz: a64ff3e533e71d04437f706197266782fd5ab3ec8fe4df047814cd2ffda5dc9bea24040bb93ddfb4b794c068e57df4d5f710d8b941a7cbe8384c57cc039c2db8
+  metadata.gz: '095fb61691550d6b95064d6d64e821759fd57d820f065eef9785284329bc8edceb69f8a29e244a25258851acc540bbc99446823f2309f4a1f2e6d8454cde779d'
+  data.tar.gz: 308d0fe1766731ff4977783249d12a0ac9f845321124b4db793ef5ed13c00585af36afa4958e7ee5fe57d7175ac5d481f1a822fe0151552a9a9856050712ad10

data/.github/workflows/rubocop.yml

@@ -1,5 +1,5 @@
 name: Rubocop
-on: [push]
+on: [pull_request]
 jobs:
   Rubocop:
     runs-on: ubuntu-latest

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

@@ -1,12 +1,12 @@
 name: MySql
-on: [push]
+on: [pull_request]
 jobs:
   Test-With-Mysql:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.0.4, 5.2.6]
+        active_record: [6.1.4, 6.0.4, 5.2.6]
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
       DATABASE_ADAPTER: mysql

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

@@ -1,5 +1,5 @@
 name: PostgreSQL
-on: [push]
+on: [pull_request]
 jobs:
   Test-With-PostgreSQL:
     runs-on: ubuntu-latest
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.0.4, 5.2.6]
+        active_record: [6.1.4, 6.0.4, 5.2.6]
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
       DATABASE_ADAPTER: postgresql

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

@@ -1,12 +1,12 @@
 name: SQLite
-on: [push]
+on: [pull_request]
 jobs:
   Test-With-SQLite:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        active_record: [6.0.4, 5.2.6]
+        active_record: [6.1.4, 6.0.4, 5.2.6]
     env:
       ACTIVE_RECORD_VERSION: ${{ matrix.active_record }}
       DATABASE_ADAPTER: sqlite3

data/bin/test

@@ -2,39 +2,31 @@
 # frozen_string_literal: true
 
 require "English"
+require "yaml"
 
-ADAPTERS = %w[
-  mysql
-  postgresql
-  sqlite3
-].freeze
+active_record_versions = []
+database_adapters = []
 
-ACTIVE_RECORD_VERSIONS = %w[
-  6.0.4
-  5.2.6
-].freeze
+# Extract ActiveRecord versions and database adapters from CI workflows
+Dir[".github/workflows/test-**.yml"].each do |path|
+  yml = YAML.load_file(path)
+  job = yml["jobs"].values.first
+  active_record_versions << job["strategy"]["matrix"]["active_record"]
+  database_adapters << job["env"]["DATABASE_ADAPTER"]
+end
 
 class Matrix
-  def self.run
-    new.run
-  end
-
-  def initialize
+  def initialize(active_record_versions, database_adapters)
+    @active_record_versions = active_record_versions
+    @database_adapters = database_adapters
     @exit_status_code = 0
   end
 
-  def run # rubocop:disable Metrics/MethodLength
+  def run
     original_ar_version = `bundle show activerecord`.split("-").last.strip
-    ACTIVE_RECORD_VERSIONS.each do |ar_version|
-      puts "----> Switching ActiveRecord to version #{ar_version}"
-      cmd("ACTIVE_RECORD_VERSION=#{ar_version} bundle update activerecord")
-
-      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
+    @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 activerecord")
 
@@ -47,6 +39,16 @@ class Matrix
     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 activerecord")
+
+    @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
 
-Matrix.run
+Matrix.new(active_record_versions.flatten.uniq, database_adapters.uniq).run

data/lib/activerecord/cte/core_ext.rb

@@ -46,8 +46,8 @@ module ActiveRecord
 
     private
 
-    def build_arel(aliases)
-      arel = super(aliases)
+    def build_arel(*args, **kwargs)
+      arel = super
       build_with(arel) if @values[:with]
       arel
     end

data/lib/activerecord/cte/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Cte
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cte
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Vlado Cingel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-27 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord