Comparing version 0.5.17 to 0.5.18
@@ -346,7 +346,7 @@ /* eslint no-shadow: 0, no-param-reassign: 0 */ | ||
var joinedQuery = _lodash2['default'].reduce(relations, function (query, relations, key) { | ||
if (_lodash2['default'].startsWith(key, '_')) return query; | ||
var joinedQuery = query['do'](function (row) { | ||
return row.merge(_lodash2['default'].reduce(relations, function (joinObject, relations, key) { | ||
if (_lodash2['default'].startsWith(key, '_')) return joinObject; | ||
var relation = _this5.getRelation(key); | ||
query = query.merge(function (row) { | ||
var relation = _this5.getRelation(key); | ||
var relatedQuery = relation.query(row, relations); | ||
@@ -365,8 +365,6 @@ relatedQuery = relation.coerceType(relatedQuery); | ||
return _defineProperty({}, key, relatedQuery); | ||
}); | ||
return _extends({}, joinObject, _defineProperty({}, key, relatedQuery)); | ||
}, {})); | ||
}); | ||
return query; | ||
}, query); | ||
return _rethinkdb2['default'].branch(query.typeOf().eq('NULL').not(), joinedQuery, query); | ||
@@ -373,0 +371,0 @@ } |
{ | ||
"name": "nothinkdb", | ||
"version": "0.5.17", | ||
"version": "0.5.18", | ||
"description": "Functional toolkit for rethinkdb", | ||
@@ -5,0 +5,0 @@ "main": "lib/nothinkdb.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
36977
783