activerecord_nested_scope 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a5162acf18c8e70f87b21f4dc4df15d5a1c5a32de4c63aaf949b3a8b60c5c3
-  data.tar.gz: 34e4a88f240b89d517986ad960f11f27874afc8e186b79b7e4f0b7878e7e7191
+  metadata.gz: 873946315cf0ac4297ef8a4b16db871e009886c757f380006a4b980d67fbf59b
+  data.tar.gz: a05ed25fd35de7eb5b3418899f781105da5e8624b200da1689588f50cb00007b
 SHA512:
-  metadata.gz: a2c93ab0ebd9e53f7b8aee4d1780974b989b5d232550f5feb30dad0a71c170c467e63563ab7774116953bc4aa809f5ffd7f01e0ed0f5b68a11f0a9394d073298
-  data.tar.gz: 9d6222989f2dc3d5c14d622f188319de79d7d61f8a60e1d6a686d689e62dd8d958aaddb2f15c3e26684e8cfc7fc23ed066801ab4debee02922394d7b25ecb6f2
+  metadata.gz: fe922e968ee53fce622f4fe149582167b6b16336c09d49befb57476ab5d79ee5a8acf2811390ee06d87dff2b676180a220a7579ffb672e47e1d509a0b44bf65a
+  data.tar.gz: c3954c2d58bdd3ef006556c0fb84ce613b3249784cad10a829e3eb1ce46cd5cad594ff7ef85070ba33bf025cae5c3457151680bf03ff9ced9fe0e1fb38765c91

data/.gitignore

@@ -9,7 +9,7 @@ doc/
 pkg/
 spec/reports/
 spec/dummy/config/database.yml
-spec/dummy/db/schema.rb
+spec/dummy/db/schema*.rb
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/*

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.1
+
+* Fix query for associations with primary key option.
+
 ## 1.1.0
 
 * Add short query feature for simple belongs_to association.

data/lib/activerecord_nested_scope/builder.rb

@@ -33,14 +33,14 @@ module ActiveRecordNestedScope
       return node.klass.none unless child
 
       relation = child_relation(child, select: node.reflection.foreign_key)
-      node.klass.where(node.klass.primary_key => relation)
+      node.klass.where(node.reflection.active_record_primary_key => relation)
     end
 
     def belongs_to_relation(node)
       child = node.children.first
       return node.klass.none unless child
 
-      relation = child_relation(child, select: node.reflection.klass.primary_key)
+      relation = child_relation(child, select: node.reflection.active_record_primary_key)
       node.klass.where(node.reflection.foreign_key => relation)
     end
 

data/lib/activerecord_nested_scope/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordNestedScope
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_nested_scope
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord