ar_virtual_field 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc1272f024fe7a86c06dbe98014598a79749c0e3f0b3f73aabc1abc93371e1a
-  data.tar.gz: 53662047fab832aafbcba2c18852bdea1938c27d79544a2346f0b242ef822cc0
+  metadata.gz: a871df479155905f1c6ea44b517cc09509073fd5f185d3d81385f6b523aa125e
+  data.tar.gz: f30f5a2a4680eeb1d12affd531c8db957eddb2ae688bd8c2622efee9dba1da9b
 SHA512:
-  metadata.gz: 195918203bffe10d882d03a950b8b89181b5cfdcebdbe700838883f006750c56fdd47c46b3ec184ea4a69155d70c0b2e49c367591e2027294bdaddfa856a9a78
-  data.tar.gz: 89de4af73dc65462a02fd4dc966fe518373c11b23b0dc2e21e6e1979932123868dcd65afbe55ea9d8cb434db6e85495444fe9b4490cfa9665411e26c857c06cd
+  metadata.gz: f5ecb4f531ed0b073a0f894cf6ee1316c2fdaff34428f6949c85c20dc25f3aa59c212bac4be7b2e836b5e592fc373a1835466eec4f720de06e7432ec011a6973
+  data.tar.gz: ba3978ceb24a0ca7f04028ceaeb11933949d19f823412389615b142b28d4334f72b8d310924f83e5e0a347fd2d14a08e2b1dd78c5a5457d7b28bf16cf042f009

data/README.md

@@ -39,12 +39,12 @@ Example:
 class User < ApplicationRecord
   virtual_field :total_orders,
     scope: -> { joins(:orders).group(:id) },
-    select: -> { "COUNT(orders.id)" },
+    select: "COUNT(orders.id)",
     get: -> { orders.count },
     default: 0
 
   virtual_field :fullname,
-    select: -> { "name || surname" },
+    select: "name || surname",
     get: -> { "#{name}#{surname}" }
 end
 
@@ -52,7 +52,7 @@ users_with_orders = User.with_total_orders # queries database once
 
 user = users_with_orders.first
 user.total_orders # => value computed by database
-user.fullname # => value computed by database
+user.fullname # => value computed by ruby
 ```
 
 ### Scopes and querying:
@@ -60,7 +60,7 @@ user.fullname # => value computed by database
  - `with_#{name}`: Automatically generated scope to include the virtual field in queries. You can use this scope in your ActiveRecord queries like so:
 
 ```ruby
-User.with_total_orders.where(ArVirtualField[:total_orders] => 5)
+User.with_total_orders.where('total_orders = ?', 5)
 ```
 
 This will include the total_orders virtual field in the SQL query and allow filtering by it.

data/lib/ar_virtual_field/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArVirtualField
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/lib/ar_virtual_field.rb

@@ -13,20 +13,12 @@ module ArVirtualField
     end
 
     def self.table_name(name)
-      sanitize_table_name("#{name}_outer")
+      "#{name}_outer"
     end
 
     def self.table_with_column(name)
-      sanitize_table_name("#{name}_outer.#{name}")
+      "#{name}_outer.#{name}"
     end
-
-    def self.sanitize_table_name(table)
-      ActiveRecord::Base.connection.quote_table_name(table)
-    end
-  end
-
-  def self.[](field)
-    Arel.sql(HelperMethods.table_with_column(field))
   end
 
   def virtual_field(name, scope: nil, select:, get:, default: nil)
@@ -55,7 +47,11 @@ module ArVirtualField
 
         HelperMethods.select_append(joins(<<~SQL.squish), "#{HelperMethods.table_with_column(name)} AS #{name}")
           LEFT JOIN (#{scope_query.to_sql}) #{HelperMethods.table_name(name)}
-            ON #{HelperMethods.table_name(name)}.id = #{table_name}.id
+            ON #{
+              Array(primary_key).map do |pk|
+                "#{HelperMethods.table_name(name)}.#{pk} = #{table_name}.#{pk}"
+              end.join(' AND')
+            }
         SQL
       end)
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_virtual_field
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pavel Egorov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds .virtual_field method to make it easy to define virtual fields
 email:
 - moonmeander47@ya.ru