fix issue where preload opts from polymorphic_belongs_to were not passed down in to individual include_in calls

Author: leafo

lapis/db/model/relations.lua

@@ -678,11 +678,28 @@ polymorphic_belongs_to = function(self, name, opts)
         end
         filtered = _accum_0
       end
-      model:include_in(filtered, id_col, {
+      local include_opts = {
         for_relation = name,
         as = name,
         fields = fields and fields[type_name]
-      })
+      }
+      if preload_opts then
+        for k, v in pairs(preload_opts) do
+          local _continue_0 = false
+          repeat
+            if k == "fields" then
+              _continue_0 = true
+              break
+            end
+            include_opts[k] = v
+            _continue_0 = true
+          until true
+          if not _continue_0 then
+            break
+          end
+        end
+      end
+      model:include_in(filtered, id_col, include_opts)
     end
     return objs
   end

lapis/db/model/relations.moon

@@ -517,12 +517,19 @@ polymorphic_belongs_to = (name, opts) =>
     for {type_name, model_name} in *types
       model = assert_model @@, model_name
       filtered = [o for o in *objs when o[type_col] == @@[enum_name][type_name]]
-      model\include_in filtered, id_col, {
+      include_opts = {
         for_relation: name
         as: name
         fields: fields and fields[type_name]
       }
 
+      if preload_opts
+        for k, v in pairs preload_opts
+          continue if k == "fields"
+          include_opts[k] = v
+
+      model\include_in filtered, id_col, include_opts
+
     objs
 
   -- TODO: deprecate this for use of `preload` or `Model:preload_relation` method

spec/relations_spec.moon

@@ -803,9 +803,10 @@ describe "lapis.db.model.relations", ->
     assert.same nil, rawget Child, "get_user"
 
   describe "polymorphic belongs to", ->
-    local Foos, Bars, Bazs, Items
+    local Foos, Bars, Bazs, Items, preload
 
     before_each ->
+      import preload from require "lapis.db.model"
       models.Foos = class Foos extends Model
       models.Bars = class Bars extends Model
         @primary_key: "frog_index"
@@ -944,6 +945,39 @@ describe "lapis.db.model.relations", ->
         'SELECT c, d FROM "bazs" WHERE "id" IN (113)'
       }
 
+    it "preloads with skip_included option", ->
+      foo = models.Foos\load {
+        id: 111
+      }
+
+      items = {
+        Items\load {
+          object_type: 1
+          object_id: 111
+          object: foo
+        }
+
+        Items\load {
+          object_type: 1
+          object_id: 222
+        }
+
+        Items\load {
+          object_type: 2
+          object_id: 333
+        }
+      }
+
+      assert_queries {
+        'SELECT * FROM "foos" WHERE "id" IN (222)'
+        'SELECT * FROM "bars" WHERE "frog_index" IN (333)'
+      }, ->
+        preload items, object: {
+          [preload]: {
+            skip_included: true
+          }
+        }
+
   it "finds relation", ->
     import find_relation from require "lapis.db.model.relations"
 
@@ -1872,7 +1906,7 @@ describe "lapis.db.model.relations", ->
         random: "option"
       }, preload_opts
 
-    it "with skip_included preload option #ddd", ->
+    it "with skip_included preload option", ->
       models.Items = class Items extends Model
         @relations: {
           {"parents", has_many: "Items", key: "parent_id"}
@@ -2222,4 +2256,3 @@ describe "lapis.db.model.relations", ->
           { id: 201, user_id: 20 }
         }, users[3].tags
 
-