Correcting issue with caching and sql literals in joins in resource def

Author: DavidMikeSimon

lib/jsonapi/resource.rb

@@ -1153,7 +1153,7 @@ def preload_included_fragments(resources, records, serializer, options)
         target_resources = {}
         include_directives.paths.each do |path|
           # If path is [:posts, :comments, :author], then...
-          pluck_attrs = [] # [posts.id, comments.id, authors.id, authors.updated_at]
+          pluck_attrs = [] # ...will be [posts.id, comments.id, authors.id, authors.updated_at]
           pluck_attrs << self._model_class.arel_table[self._primary_key]
 
           relation = records
@@ -1179,7 +1179,10 @@ def preload_included_fragments(resources, records, serializer, options)
             ar_hash = assocs_path.reverse.reduce{|memo, step| { step => memo } }
             # We can't just look up the table name from the resource class, because Arel could
             # have used a table alias if the relation includes a self-reference.
-            table = relation.joins(ar_hash).arel.source.right.last.left
+            join_source = relation.joins(ar_hash).arel.source.right.reverse.find do |arel_node|
+              arel_node.is_a?(Arel::Nodes::InnerJoin)
+            end
+            table = join_source.left
             parent_klass = klass
             klass = relationship.resource_klass
             pluck_attrs << table[klass._primary_key]

lib/jsonapi/resource_serializer.rb

@@ -179,7 +179,7 @@ def process_primary(source, include_directives)
 
     def supplying_attribute_fields(resource_klass)
       @_supplying_attribute_fields.fetch resource_klass do
-        attrs = Set.new(resource_klass._attributes.keys)
+        attrs = Set.new(resource_klass._attributes.keys.map(&:to_sym))
         cur = resource_klass
         while cur != JSONAPI::Resource
           if @fields.has_key?(cur._type)
@@ -194,7 +194,7 @@ def supplying_attribute_fields(resource_klass)
 
     def supplying_relationship_fields(resource_klass)
       @_supplying_relationship_fields.fetch resource_klass do
-        relationships = Set.new(resource_klass._relationships.keys)
+        relationships = Set.new(resource_klass._relationships.keys.map(&:to_sym))
         cur = resource_klass
         while cur != JSONAPI::Resource
           if @fields.has_key?(cur._type)

test/controllers/controller_test.rb

@@ -3577,13 +3577,15 @@ def test_whitelisted_error_in_controller
 end
 
 class Api::V6::PostsControllerTest < ActionController::TestCase
-  def test_with_sql_fragment
-    get :index, params: {include: 'section'}
+  def test_caching_with_join_from_resource_with_sql_fragment
+    assert_cacheable_get :index, params: {include: 'section'}
     assert_response :success
   end
+end
 
-  def test_caching_with_sql_fragment
-    assert_cacheable_get :index, params: {include: 'section'}
+class Api::V6::SectionsControllerTest < ActionController::TestCase
+  def test_caching_with_join_to_resource_with_sql_fragment
+    assert_cacheable_get :index, params: {include: 'posts'}
     assert_response :success
   end
-end
+end

test/fixtures/active_record.rb

@@ -54,6 +54,7 @@
 
   create_table :sections, force: true do |t|
     t.string :name
+    t.timestamps null: false
   end
 
   create_table :posts_tags, force: true do |t|
@@ -343,6 +344,7 @@ class Tag < ActiveRecord::Base
 end
 
 class Section < ActiveRecord::Base
+  has_many :posts
 end
 
 class HairCut < ActiveRecord::Base
@@ -758,6 +760,9 @@ module V6
     class PostsController < JSONAPI::ResourceController
     end
 
+    class SectionsController < JSONAPI::ResourceController
+    end
+
     class CustomersController < JSONAPI::ResourceController
     end
 
@@ -1464,7 +1469,11 @@ module Api
   module V6
     class PersonResource < PersonResource; end
     class TagResource < TagResource; end
-    class SectionResource < SectionResource; end
+
+    class SectionResource < SectionResource
+      has_many :posts
+    end
+
     class CommentResource < CommentResource; end
 
     class PostResource < PostResource

test/test_helper.rb

@@ -322,6 +322,7 @@ class CatResource < JSONAPI::Resource
     JSONAPI.configuration.route_format = :dasherized_route
     namespace :v6 do
       jsonapi_resources :posts
+      jsonapi_resources :sections
       jsonapi_resources :customers
       jsonapi_resources :purchase_orders
       jsonapi_resources :line_items