1.1 --- a/env/model/has_rendered_content.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/env/model/has_rendered_content.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -function model.has_rendered_content(class, rendered_class, content_field_name)
     1.5 +function model.has_rendered_content(class, rendered_class, content_field_name, primary_key)
     1.6  
     1.7    local content_field_name = content_field_name or 'content'
     1.8    
     1.9 @@ -12,6 +12,8 @@
    1.10        for i, key in ipairs(class.primary_key) do
    1.11          selector:add_where{ "$ = ?", { key }, self[key] }
    1.12        end
    1.13 +    elseif class.primary_key then
    1.14 +      selector:add_where{ "$ = ?", { class.primary_key }, self[class.primary_key] }
    1.15      else
    1.16        selector:add_where{ "id = ?", self.id }
    1.17      end
    1.18 @@ -24,6 +26,8 @@
    1.19          for i, key in ipairs(class.primary_key) do
    1.20            selector:add_where{ "$.$ = ?", { rendered_class.table }, { key }, self[key] }
    1.21          end
    1.22 +      elseif class.primary_key then
    1.23 +        selector:add_where{ "$." .. primary_key .. " = ?", { rendered_class.table }, self[class.primary_key] }
    1.24        else
    1.25          selector:add_where{ "$." .. class.table .. "_id = ?", { rendered_class.table }, self.id }
    1.26        end
    1.27 @@ -43,6 +47,8 @@
    1.28        for i, key in ipairs(class.primary_key) do
    1.29          rendered[key] = self[key]
    1.30        end
    1.31 +    elseif class.primary_key then
    1.32 +      rendered[primary_key] = self[class.primary_key]
    1.33      else
    1.34        rendered[class.table .. "_id"] = self.id
    1.35      end
    1.36 @@ -65,6 +71,8 @@
    1.37        for i, key in ipairs(class.primary_key) do
    1.38          selector:add_where{ "$.$ = ?", { rendered_class.table }, { key }, self.id }
    1.39        end
    1.40 +    elseif class.primary_key then
    1.41 +      selector:add_where{ primary_key .. " = ?", self[class.primary_key] }
    1.42      else
    1.43        selector:add_where{ class.table .. "_id = ?", self.id }
    1.44      end
    1.45 @@ -79,4 +87,4 @@
    1.46      return rendered.content
    1.47    end
    1.48  
    1.49 -end
    1.50 \ No newline at end of file
    1.51 +end