active_model_serializers_pg 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3c698a1508537d359551eb125a45c38bd0921dfd059ae49422dd7d114aa7f2
-  data.tar.gz: 677ac55b0c35a51ba03b042b34ed3fd560b57d223b6687ca020eaa3b131aabda
+  metadata.gz: e76f115e2f83261f48bd94bd4bf72a14ba90e75b0e8cf8bd5f141122950424c4
+  data.tar.gz: df09967cbaa3a0e594fd8357e12ac8a4db43b53a06e77d259e5c7e3d2ac24931
 SHA512:
-  metadata.gz: 82f91e03d0b6440e6b6002909b51e346c5e21293659ca0fc80b976df30bcfc089a294b1c4f42a7ca20c01b20d612203ead218ec3c268d5bd5bb4832652df923d
-  data.tar.gz: d906a81cde8076d6150f6466263619f5283d3f5e1e9bbcedaef938f8f5633e2fdd2d1366ef3ca18343669773ef09809cc837df3cc99719ecaefbdae8a94ff2a7
+  metadata.gz: daed8e7d80f643cfe961eeb162829f941c73c3e015b9e32fe68d5bf23aa0444f348ae2714847e282603a0a0676a11c29e9b4c20d8d413ac1a2e4b4dee2b96fc4
+  data.tar.gz: 18709557dca29fed95387c97fb684926e3c68593692fd62f14dc600af46e42c173dba2a1543787a79c942a47ddc1386fd12d7507489067b45a877010eb782ca8

data/lib/active_model_serializers/adapter/json_api_pg.rb

@@ -173,6 +173,20 @@ class JsonThing
     (@sql_methods[field] ||= _sql_method(field))[0]
   end
 
+  # Returns the primary key column as a string,
+  # but if there is a "#{primary_key}__sql" method,
+  # then call that and return it instead.
+  # We use this for the id reported in the jsonapi output,
+  # but not for foreign key relationships.
+  def primary_key_attr
+    pk = primary_key
+    if has_sql_method?(pk)
+      sql_method(pk)
+    else
+      pk
+    end
+  end
+
   private
 
   # This needs to be globally unique within the SQL query,
@@ -494,7 +508,7 @@ class JsonApiPgSql
   def select_resource_relationship_links(resource, reflection)
     reflection.links.map {|link_name, link_parts|
       <<~EOQ
-        '#{link_name}', CONCAT(#{link_parts.join(%Q{, "#{resource.parent.table_name}"."#{resource.parent.primary_key}", })})
+        '#{link_name}', CONCAT(#{link_parts.join(%Q{, "#{resource.parent.table_name}"."#{resource.parent.primary_key_attr}", })})
       EOQ
     }.join(",\n")
   end
@@ -545,7 +559,6 @@ class JsonApiPgSql
           # or from the class's default scope.
           # TODO: preserve the whole custom relation, not just ordering
           p = refl.ar_class.new
-          ordering = nil
           ordering = p.send(refl.name).arel.orders
           ordering = child_resource.ar_class.default_scoped.arel.orders if ordering.empty?
           ordering = ordering.map{|o|
@@ -562,7 +575,7 @@ class JsonApiPgSql
           ordering = "ORDER BY #{ordering}" if ordering
           <<~EOQ
             LEFT OUTER JOIN LATERAL (
-              SELECT  coalesce(jsonb_agg(jsonb_build_object('id', rel."#{child_resource.primary_key}"::text,
+              SELECT  coalesce(jsonb_agg(jsonb_build_object('id', rel."#{child_resource.primary_key_attr}"::text,
                                                             'type', '#{child_resource.json_type}') #{ordering}), '[]') AS j
               FROM    "#{child_resource.table_name}" rel
               WHERE   rel."#{child_resource.foreign_key}" = "#{resource.table_name}"."#{resource.primary_key}"
@@ -575,7 +588,7 @@ class JsonApiPgSql
           when ActiveRecord::Relation
             rel = refl.reflection_sql
             sql = rel.select(<<~EOQ).to_sql
-              coalesce(jsonb_agg(jsonb_build_object('id', "#{child_resource.table_name}"."#{child_resource.primary_key}"::text,
+              coalesce(jsonb_agg(jsonb_build_object('id', "#{child_resource.table_name}"."#{child_resource.primary_key_attr}"::text,
                                                     'type', '#{child_resource.json_type}')), '[]') AS j
             EOQ
             <<~EOQ
@@ -588,7 +601,7 @@ class JsonApiPgSql
       elsif refl.has_one?
         <<~EOQ
           LEFT OUTER JOIN LATERAL (
-            SELECT  jsonb_build_object('id', rel."#{child_resource.primary_key}"::text,
+            SELECT  jsonb_build_object('id', rel."#{child_resource.primary_key_attr}"::text,
                                       'type', '#{child_resource.json_type}') AS j
             FROM    "#{child_resource.table_name}" rel
             WHERE   rel."#{child_resource.foreign_key}" = "#{resource.table_name}"."#{resource.primary_key}"
@@ -704,7 +717,7 @@ class JsonApiPgSql
   def select_resource(resource)
     fields = fields_for(resource)
     <<~EOQ
-      jsonb_build_object('id', "#{resource.table_name}"."#{resource.primary_key}"::text,
+      jsonb_build_object('id', "#{resource.table_name}"."#{resource.primary_key_attr}"::text,
                          'type', '#{resource.json_type}',
                          'attributes', #{select_resource_attributes(resource)}
                          #{maybe_select_resource_relationships(resource)})

data/lib/active_model_serializers_pg/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersPg
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_pg
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Paul A. Jungwirth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers