activerecord-virtual_attributes 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb60079c2b76281f9ace2d7f4a25c9956d9c439c408b6d0df615cb8c4512a31f
-  data.tar.gz: 6eb95ac5ea930cd875c73e8fcfaca826e3f69370417489f9c074c2c90795e71e
+  metadata.gz: 8a35d6c7665469341b76ae68e1a84180ccef887c47f56b7000efc2f0024d0a93
+  data.tar.gz: ba57d73a5034e461d3c6bd77a50eb5475d1fe0dab8c3332f91142c893fa736a2
 SHA512:
-  metadata.gz: e0d8221e8ee5ce87f5082c7e3e7b821375e0da1c6109bd772c1ee01fb396de12169c3f6ac53cdddd267d7974785b81ca0047ccf4b0ed43278b79bdb84c2cd557
-  data.tar.gz: 0b980f5df648db206618fd304ac54fd69f84ed53e004226629ddcc389775686934291baaf106cf196b0fe5204107046bf437f6db12b41a632a62dba88c71b0a0
+  metadata.gz: 55f8e509034dc3a13dae283733da176c308d25538c38595cebfd98008d07be372c0843752e547be6afb5af361fd1610900f05fc52cdcdfbd8bff834b66233060
+  data.tar.gz: c4511ba748f911a985f308bdfa61f9d6c64c57ec1245003dea509205f3aa4e0085f20f7e9adb5674d3657d750c34e6c4d64d41ee5faebb18846c9e8ef3ea4c32

data/.github/workflows/ci.yaml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
 
 jobs:
   ci:
@@ -15,27 +19,20 @@ jobs:
         env:
           POSTGRES_PASSWORD: password
           POSTGRES_DB: virtual_attributes
+        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
         ports:
         - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 2s
-          --health-timeout 5s
-          --health-retries 5
       mysql:
         image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: virtual_attributes
+        options: --health-cmd="mysqladmin ping -h 127.0.0.1 -P 3306 --silent" --health-interval 10s --health-timeout 5s --health-retries 3
         ports:
         - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping -h 127.0.0.1 -P 3306 --silent"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 3
     env:
-      # for the pg cli (psql, pg_isready) and possibly rails
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      # for the pg cli (psql, pg_isready) and rails
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
@@ -50,24 +47,22 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
+        timeout-minutes: 30
       - name: Run SQLite tests
         env:
           DB: sqlite3
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         run: bundle exec rake
-      - name: Run Postgres tests
+      - name: Run PostgreSQL tests
         env:
           DB: pg
           COLLATE_SYMBOLS: false
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         run: bundle exec rake
       - name: Run MySQL tests
         env:
           DB: mysql2
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         run: bundle exec rake
-      - if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' }}
-        name: Report code coverage
+      - name: Report code coverage
+        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' }}
         continue-on-error: true
         uses: paambaati/codeclimate-action@v3.0.0
         env:

data/CHANGELOG.md

@@ -1,12 +1,12 @@
 # Change Log
 
-Versioning of this gem follows ActiveRecord versioning, and does not follow SemVer.
+The versioning of this gem follows ActiveRecord versioning, and does not follow SemVer.  See the [README](./README.md) for more details.
 
-e.g.: virtual attributes 6.1.x supports all versions of rails 6.1.
+## [Unreleased]
 
-Use the latest version of both this gem and rails where the first 2 digits match.
+## [6.1.1] - 2022-08-09
 
-## [Unreleased]
+* fix HomogeneousIn clauses [#111](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/111)
 
 ## [6.1.0] - 2022-02-03
 
@@ -86,7 +86,8 @@ Use the latest version of both this gem and rails where the first 2 digits match
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.1...HEAD
+[6.1.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.0...v6.1.1
 [6.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v3.0.0...v6.1.0
 [3.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v2.0.0...v3.0.0
 [2.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.6.0...v2.0.0

data/README.md

@@ -12,6 +12,12 @@ This gem allows you to represent these attributes in sql so `ORDER BY` `WHERE` c
 
 This also allows you to calculate counts and treat those as a field accessible with `select(:child_count)` to get rid of the N+1 problem of running a `count(*)` on a subcollection for each row.
 
+## Versioning
+
+As of v6.1.0, the versioning of this gem follows ActiveRecord versioning, and does not follow SemVer (e.g. virtual attributes v6.1.x supports all versions of Rails 6.1). Version v3.0.0 supports Rails 6.0 and lower.
+
+Use the latest version of both this gem and Rails where the first 2 digits match.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "6.1.0".freeze
+    VERSION = "6.1.1".freeze
   end
 end

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -12,7 +12,27 @@ module ActiveRecord
 
     # in essence, this is our Arel::Nodes::VirtualAttribute
     class Arel::Nodes::Grouping
-      attr_accessor :name
+      attr_accessor :name, :relation
+
+      # methods from Arel::Nodes::Attribute
+      def type_caster
+        relation.type_for_attribute(name)
+      end
+
+      # Create a node for lowering this attribute
+      def lower
+        relation.lower(self)
+      end
+
+      def type_cast_for_database(value)
+        relation.type_cast_for_database(name, value)
+      end
+
+      # rubocop:disable Rails/Delegate
+      def able_to_type_cast?
+        relation.able_to_type_cast?
+      end
+      # rubocop:enable Rails/Delegate
     end
 
     module VirtualArel
@@ -86,6 +106,7 @@ module ActiveRecord
           arel = arel_lambda.call(table)
           arel = Arel::Nodes::Grouping.new(arel) unless arel.kind_of?(Arel::Nodes::Grouping)
           arel.name = column_name
+          arel.relation = table
           arel
         end
 
@@ -98,3 +119,43 @@ module ActiveRecord
     end
   end
 end
+
+module Arel # :nodoc: all
+  # rubocop:disable Naming/MethodName
+  # rubocop:disable Naming/MethodParameterName
+  # rubocop:disable Style/ConditionalAssignment
+  module Visitors
+    # rails 6.1...
+    class ToSql
+      private
+
+      def visit_Arel_Nodes_HomogeneousIn(o, collector)
+        collector.preparable = false
+
+        # change:
+        # See https://github.com/rails/rails/pull/45642
+        visit(o.left, collector)
+        # /change
+
+        if o.type == :in
+          collector << " IN ("
+        else
+          collector << " NOT IN ("
+        end
+
+        values = o.casted_values
+
+        if values.empty?
+          collector << @connection.quote(nil)
+        else
+          collector.add_binds(values, o.proc_for_binds, &bind_block)
+        end
+
+        collector << ")"
+      end
+    end
+  end
+  # rubocop:enable Naming/MethodName
+  # rubocop:enable Naming/MethodParameterName
+  # rubocop:enable Style/ConditionalAssignment
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Access non-sql attributes from sql