Skip to content

Stable Version 0.11.9 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 22, 2016
Merged

Stable Version 0.11.9 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c55e292
Stable Version 0.11.8
techniq Jan 19, 2016
4dfb3aa
Allow setting DEBUG=true env variable for debug knex logging in tests
techniq Jan 22, 2016
89ede85
Use arrow functions consistently
techniq Jan 22, 2016
b190930
Support querying against hasMany relations using WHERE EXISTS.
techniq Jan 22, 2016
3064071
Allow specifying relation's name or localField in query
techniq Jan 22, 2016
30c2d1d
Prefer "native" impl instead of DSUtils/mout.js
techniq Jan 22, 2016
e11c77a
Stable Version 0.11.9
techniq Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 103 additions & 91 deletions dist/js-data-sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ module.exports =

'use strict';

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; })();

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
Expand All @@ -68,66 +68,6 @@ module.exports =
return resourceConfig.table || underscore(resourceConfig.name);
}

/**
* Lookup and apply table joins to query if field contains a `.`
* @param {string} field - Field defined in where filter
* @param {object} query - knex query to modify
* @param {object} resourceConfig - Resource of primary query/table
* @param {string[]} existingJoins - Array of fully qualitifed field names for
* any existing table joins for query
* @returns {string} - field updated to perspective of applied joins
*/
function applyTableJoins(field, query, resourceConfig, existingJoins) {
if (DSUtils.contains(field, '.')) {
(function () {
var parts = field.split('.');
var localResourceConfig = resourceConfig;

var relationPath = [];

var _loop = function _loop() {
var relationName = parts.shift();
var relationResourceConfig = resourceConfig.getResource(relationName);
relationPath.push(relationName);

if (!existingJoins.some(function (t) {
return t === relationPath.join('.');
})) {
var _localResourceConfig$ = localResourceConfig.relationList.filter(function (r) {
return r.relation === relationName;
});

var _localResourceConfig$2 = _slicedToArray(_localResourceConfig$, 1);

var relation = _localResourceConfig$2[0];

if (relation) {
var table = getTable(localResourceConfig);
var localId = table + '.' + relation.localKey;

var relationTable = getTable(relationResourceConfig);
var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;

query.join(relationTable, localId, foreignId);
existingJoins.push(relationPath.join('.'));
} else {
// hopefully a qualified local column
}
}
localResourceConfig = relationResourceConfig;
};

while (parts.length >= 2) {
_loop();
}

field = getTable(localResourceConfig) + '.' + parts[0];
})();
}

return field;
}

function loadWithRelations(items, resourceConfig, options) {
var _this = this;

Expand Down Expand Up @@ -198,12 +138,12 @@ module.exports =

if (instance) {
var itemKeys = instance[def.localKeys] || [];
itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
itemKeys = Array.isArray(itemKeys) ? itemKeys : Object.keys(itemKeys);
localKeys = localKeys.concat(itemKeys || []);
} else {
DSUtils.forEach(items, function (item) {
var itemKeys = item[def.localKeys] || [];
itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
itemKeys = Array.isArray(itemKeys) ? itemKeys : Object.keys(itemKeys);
localKeys = localKeys.concat(itemKeys || []);
});
}
Expand Down Expand Up @@ -232,29 +172,35 @@ module.exports =
})();
} else if (def.type === 'belongsTo' || def.type === 'hasOne' && def.localKey) {
if (instance) {
task = _this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(function (relatedItem) {
instance[def.localField] = relatedItem;
return relatedItem;
});
var id = DSUtils.get(instance, def.localKey);
if (id) {
task = _this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(function (relatedItem) {
instance[def.localField] = relatedItem;
return relatedItem;
});
}
} else {
task = _this.findAll(resourceConfig.getResource(relationName), {
where: _defineProperty({}, relationDef.idAttribute, {
'in': DSUtils.filter(items.map(function (item) {
return DSUtils.get(item, def.localKey);
}), function (x) {
return x;
var ids = DSUtils.filter(items.map(function (item) {
return DSUtils.get(item, def.localKey);
}), function (x) {
return x;
});
if (ids.length) {
task = _this.findAll(resourceConfig.getResource(relationName), {
where: _defineProperty({}, relationDef.idAttribute, {
'in': ids
})
})
}, __options).then(function (relatedItems) {
DSUtils.forEach(items, function (item) {
DSUtils.forEach(relatedItems, function (relatedItem) {
if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
item[def.localField] = relatedItem;
}
}, __options).then(function (relatedItems) {
DSUtils.forEach(items, function (item) {
DSUtils.forEach(relatedItems, function (relatedItem) {
if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
item[def.localField] = relatedItem;
}
});
});
return relatedItems;
});
return relatedItems;
});
}
}
}

Expand Down Expand Up @@ -290,7 +236,7 @@ module.exports =
var query = options && options.transaction || this.query;
return query.select('*').from(getTable(resourceConfig)).where(resourceConfig.idAttribute, toString(id)).then(function (rows) {
if (!rows.length) {
return DSUtils.Promise.reject(new Error('Not Found!'));
return Promise.reject(new Error('Not Found!'));
} else {
instance = rows[0];
return loadWithRelations.call(_this2, instance, resourceConfig, options);
Expand Down Expand Up @@ -380,7 +326,10 @@ module.exports =
}, {
key: 'filterQuery',
value: function filterQuery(resourceConfig, params, options) {
var _this7 = this;

var table = getTable(resourceConfig);
var joinedTables = [];
var query = undefined;

if (params instanceof Object.getPrototypeOf(this.query.client).QueryBuilder) {
Expand All @@ -398,9 +347,7 @@ module.exports =
params.orderBy = params.orderBy || params.sort;
params.skip = params.skip || params.offset;

var joinedTables = [];

DSUtils.forEach(DSUtils.keys(params), function (k) {
DSUtils.forEach(Object.keys(params), function (k) {
var v = params[k];
if (!DSUtils.contains(reserved, k)) {
if (DSUtils.isObject(v)) {
Expand All @@ -422,19 +369,82 @@ module.exports =
};
}

DSUtils.forOwn(criteria, function (v, op) {
// Apply table joins (if needed)
var processRelationField = function processRelationField(field) {
var parts = field.split('.');
var localResourceConfig = resourceConfig;
var relationPath = [];

var _loop = function _loop() {
var relationName = parts.shift();

var _localResourceConfig$ = localResourceConfig.relationList.filter(function (r) {
return r.relation === relationName || r.localField === relationName;
});

var _localResourceConfig$2 = _slicedToArray(_localResourceConfig$, 1);

var relation = _localResourceConfig$2[0];

if (relation) {
var relationResourceConfig = resourceConfig.getResource(relation.relation);
relationPath.push(relation.relation);

if (relation.type === 'belongsTo' || relation.type === 'hasOne') {
// Apply table join for belongsTo/hasOne property (if not done already)
if (!joinedTables.some(function (t) {
return t === relationPath.join('.');
})) {
var _table = getTable(localResourceConfig);
var localId = _table + '.' + relation.localKey;

var relationTable = getTable(relationResourceConfig);
var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;

query.join(relationTable, localId, foreignId);
joinedTables.push(relationPath.join('.'));
}
} else if (relation.type === 'hasMany') {
var _existsParams;

// Perform `WHERE EXISTS` subquery for hasMany property
var _table2 = getTable(localResourceConfig);
var localId = _table2 + '.' + localResourceConfig.idAttribute;

var relationTable = getTable(relationResourceConfig);
var foreignId = relationTable + '.' + relation.foreignKey;

var existsParams = (_existsParams = {}, _defineProperty(_existsParams, foreignId, { '===': knex.raw(localId) }), _defineProperty(_existsParams, parts[0], criteria), _existsParams);
query.whereExists(_this7.filterQuery(relationResourceConfig, existsParams, options));
criteria = null; // criteria handled by EXISTS subquery
}

localResourceConfig = relationResourceConfig;
} else {
// hopefully a qualified local column
}
};

while (parts.length >= 2) {
_loop();
}

return getTable(localResourceConfig) + '.' + parts[0];
};

if (DSUtils.contains(field, '.')) {
if (DSUtils.contains(field, ',')) {
var splitFields = field.split(',').map(function (c) {
return c.trim();
});
field = splitFields.map(function (splitField) {
return applyTableJoins(splitField, query, resourceConfig, joinedTables);
return processRelationField(splitField);
}).join(',');
} else {
field = applyTableJoins(field, query, resourceConfig, joinedTables);
field = processRelationField(field, query, resourceConfig, joinedTables);
}
}

DSUtils.forOwn(criteria, function (v, op) {
if (op === '==' || op === '===') {
if (v === null) {
query = query.whereNull(field);
Expand Down Expand Up @@ -503,6 +513,8 @@ module.exports =
}
} else if (op === 'like') {
query = query.where(field, 'like', v);
} else if (op === '|like') {
query = query.orWhere(field, 'like', v);
} else if (op === '|==' || op === '|===') {
if (v === null) {
query = query.orWhereNull(field);
Expand Down
3 changes: 2 additions & 1 deletion mocha.start.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ var config = {
host: process.env.DB_HOST || 'localhost',
user: process.env.DB_USER || process.env.C9_USER || 'ubuntu',
database: process.env.DB_NAME || (process.env.C9_USER ? 'c9' : 'circle_test')
}
},
debug: process.env.DEBUG || false
};

TestRunner.init({
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "js-data-sql",
"description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
"version": "0.11.7",
"version": "0.11.9",
"homepage": "http://www.js-data.io/docs/dssqladapter",
"repository": {
"type": "git",
Expand Down
Loading