Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-04 14:30:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(attribute-joined-data): Critical fix for NULL joined data values

Browse source
This commit is contained in:
Ben Gotow 2015-04-28 16:02:36 -07:00
parent 8a8cf4b06d
commit a0dc6612d8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/flux/attributes/attribute-joined-data.coffee
View file

@ -44,5 +44,6 @@ class AttributeJoinedData extends Attribute
includeSQL: (klass) ->
"LEFT OUTER JOIN `#{@modelTable}` ON `#{@modelTable}`.`id` = `#{klass.name}`.`id`"
NullPlaceholder: NullPlaceholder
module.exports = AttributeJoinedData
module.exports = AttributeJoinedData

4
src/flux/models/query.coffee
View file

@ -1,4 +1,4 @@
{Matcher, NullPlaceholder, AttributeJoinedData} = require '../attributes'
{Matcher, AttributeJoinedData} = require '../attributes'
_ = require 'underscore-plus'
###
@ -179,7 +179,7 @@ class ModelQuery
object = (new @_klass).fromJSON(json)
for attr, j in @_includeJoinedData
value = row[j+1]
value = null if value is NullPlaceholder
value = null if value is AttributeJoinedData.NullPlaceholder
object[attr.modelKey] = value
objects.push(object)
return objects[0] if @_singular