pg_serializable 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1909d56bad3b23411c7ce220bcf850489f64a20a653d064b3029a85ded8b063
-  data.tar.gz: 8a677cf086f7365a1984ba756d81360b731e38e543ec9ee512d6a7631af40bce
+  metadata.gz: 648a712ad1604caafa1ce54620bde306d99f38fba5b3897b707bce2302ac15de
+  data.tar.gz: 00e8956c9bc8c41bb967e3340cf6a51b642a06061dd9d736e586696c7662a438
 SHA512:
-  metadata.gz: d78dc887bf5a0b79514befdd4bd6ca34621a26340e62756ccd60e45d076d226f135d6777dab4ade5ef02eaa4f5346209b305b6967cac511392030f95799b8348
-  data.tar.gz: 9b71a136e79e0b768ef7f113ea8a570c3edaab932eccd60ba8ad920f819630c61fac7501e0f92d2da2fd9e0a5914b8f41e469a7294c69aabcba0a72f5b06b244
+  metadata.gz: fd39bd3c82b9732015cad9776b36c45e828fb890e2104c739ad250ee9ecf7aa913d6b328c358286f3f99e315d2b3bb8d63284ff3b679dfe0d0b89e079eaed019
+  data.tar.gz: fa604b60406ff47e4b1b7795f85481c1c10626ca9de59b221e94ba2bd20e70a9e75566ea464e184afbd03557ac916f240f84374326269f4b7de84926cd4a49b2

data/lib/pg_serializable/version.rb

@@ -1,3 +1,3 @@
 module PgSerializable
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/lib/pg_serializable/visitors/json.rb

@@ -91,12 +91,19 @@ module PgSerializable
         association = subject.association
         through = association.through_reflection
         source = association.source_reflection
+        join_name = source.collection? ? through.plural_name.to_sym : through.name
+        where_clause = begin
+          if through.belongs_to?
+            "#{table_alias}.#{through.join_foreign_key}=#{through.table_name}.#{subject.foreign_key}"
+          else
+            "#{through.table_name}.#{through.join_foreign_key}=#{table_alias}.#{subject.foreign_key}"
+          end
+        end
 
         query = visit(association
           .klass
-          .select("#{source.table_name}.*, #{through.table_name}.#{source.join_foreign_key}, #{through.table_name}.#{through.join_primary_key}")
-          .joins(through.name), table_alias: current_alias)
-          .where("#{current_alias}.#{through.join_primary_key}=#{table_alias}.#{subject.foreign_key}")
+          .joins(join_name)
+          .where(where_clause), table_alias: current_alias)
           .to_sql
 
         "\'#{subject.label}\', (#{query})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_serializable
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - matthewjf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler