From 87e78de81b30ab84eab476bd74204bcca4eb2bc0 Mon Sep 17 00:00:00 2001 From: Sean Lynch Date: Mon, 16 Nov 2015 15:52:38 -0500 Subject: [PATCH 1/3] Stable Version 0.11.6 --- dist/js-data-sql.js | 157 +++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 111 insertions(+), 48 deletions(-) diff --git a/dist/js-data-sql.js b/dist/js-data-sql.js index f2d846e..06fdefe 100644 --- a/dist/js-data-sql.js +++ b/dist/js-data-sql.js @@ -47,10 +47,10 @@ module.exports = 'use strict'; - 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; }; })(); + 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"); } }; })(); + 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; } @@ -68,6 +68,66 @@ 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; @@ -363,51 +423,16 @@ module.exports = } DSUtils.forOwn(criteria, function (v, op) { - 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 (!joinedTables.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 = query.join(relationTable, localId, foreignId); - joinedTables.push(relationPath.join('.')); - } else { - // local column - } - } - localResourceConfig = relationResourceConfig; - }; - - while (parts.length >= 2) { - _loop(); - } - - field = getTable(localResourceConfig) + '.' + parts[0]; - })(); + // Apply table joins (if needed) + 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); + }).join(','); + } else { + field = applyTableJoins(field, query, resourceConfig, joinedTables); } if (op === '==' || op === '===') { @@ -430,6 +455,44 @@ module.exports = query = query.where(field, 'in', v); } else if (op === 'notIn') { query = query.whereNotIn(field, v); + } else if (op === 'near') { + var milesRegex = /(\d+(\.\d+)?)\s*(m|M)iles$/; + var kilometersRegex = /(\d+(\.\d+)?)\s*(k|K)$/; + + var radius = undefined; + var unitsPerDegree = undefined; + if (typeof v.radius === 'number' || milesRegex.test(v.radius)) { + radius = typeof v.radius === 'number' ? v.radius : v.radius.match(milesRegex)[1]; + unitsPerDegree = 69.0; // miles per degree + } else if (kilometersRegex.test(v.radius)) { + radius = v.radius.match(kilometersRegex)[1]; + unitsPerDegree = 111.045; // kilometers per degree; + } else { + throw new Error('Unknown radius distance units'); + } + + var _field$split$map = field.split(',').map(function (c) { + return c.trim(); + }); + + var _field$split$map2 = _slicedToArray(_field$split$map, 2); + + var latitudeColumn = _field$split$map2[0]; + var longitudeColumn = _field$split$map2[1]; + + var _v$center = _slicedToArray(v.center, 2); + + var latitude = _v$center[0]; + var longitude = _v$center[1]; + + // Uses indexes on `latitudeColumn` / `longitudeColumn` if available + + query = query.whereBetween(latitudeColumn, [latitude - radius / unitsPerDegree, latitude + radius / unitsPerDegree]).whereBetween(longitudeColumn, [longitude - radius / (unitsPerDegree * Math.cos(latitude * (Math.PI / 180))), longitude + radius / (unitsPerDegree * Math.cos(latitude * (Math.PI / 180)))]); + + if (v.calculateDistance) { + var distanceColumn = typeof v.calculateDistance === 'string' ? v.calculateDistance : 'distance'; + query = query.select(knex.raw('\n ' + unitsPerDegree + ' * DEGREES(ACOS(\n COS(RADIANS(?)) * COS(RADIANS(' + latitudeColumn + ')) *\n COS(RADIANS(' + longitudeColumn + ') - RADIANS(?)) +\n SIN(RADIANS(?)) * SIN(RADIANS(' + latitudeColumn + '))\n )) AS ' + distanceColumn, [latitude, longitude, latitude])); + } } else if (op === 'like') { query = query.where(field, 'like', v); } else if (op === '|==' || op === '|===') { diff --git a/package.json b/package.json index 3bdbb22..a2f1bf3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "js-data-sql", "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.", - "version": "0.11.5", + "version": "0.11.6", "homepage": "http://www.js-data.io/docs/dssqladapter", "repository": { "type": "git", From d3d0b9ba3993a8476d63e6fc34b248c35b22afd8 Mon Sep 17 00:00:00 2001 From: Sean Lynch Date: Mon, 7 Dec 2015 10:43:57 -0500 Subject: [PATCH 2/3] Fix Standard style errors --- src/index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/index.js b/src/index.js index fa92e86..599bc3b 100644 --- a/src/index.js +++ b/src/index.js @@ -59,7 +59,7 @@ function applyTableJoins (field, query, resourceConfig, existingJoins) { field = `${getTable(localResourceConfig)}.${parts[0]}` } - return field; + return field } function loadWithRelations (items, resourceConfig, options) { @@ -330,9 +330,9 @@ class DSSqlAdapter { // Apply table joins (if needed) if (DSUtils.contains(field, ',')) { let splitFields = field.split(',').map(c => c.trim()) - field = splitFields.map(splitField => applyTableJoins(splitField, query, resourceConfig, joinedTables)).join(','); + field = splitFields.map(splitField => applyTableJoins(splitField, query, resourceConfig, joinedTables)).join(',') } else { - field = applyTableJoins(field, query, resourceConfig, joinedTables); + field = applyTableJoins(field, query, resourceConfig, joinedTables) } if (op === '==' || op === '===') { @@ -364,23 +364,23 @@ class DSSqlAdapter { } else if (op === 'notIn') { query = query.whereNotIn(field, v) } else if (op === 'near') { - const milesRegex = /(\d+(\.\d+)?)\s*(m|M)iles$/; - const kilometersRegex = /(\d+(\.\d+)?)\s*(k|K)$/; + const milesRegex = /(\d+(\.\d+)?)\s*(m|M)iles$/ + const kilometersRegex = /(\d+(\.\d+)?)\s*(k|K)$/ - let radius; - let unitsPerDegree; + let radius + let unitsPerDegree if (typeof v.radius === 'number' || milesRegex.test(v.radius)) { radius = typeof v.radius === 'number' ? v.radius : v.radius.match(milesRegex)[1] - unitsPerDegree = 69.0; // miles per degree + unitsPerDegree = 69.0 // miles per degree } else if (kilometersRegex.test(v.radius)) { radius = v.radius.match(kilometersRegex)[1] - unitsPerDegree = 111.045; // kilometers per degree; + unitsPerDegree = 111.045 // kilometers per degree; } else { throw new Error('Unknown radius distance units') } let [latitudeColumn, longitudeColumn] = field.split(',').map(c => c.trim()) - let [latitude, longitude] = v.center; + let [latitude, longitude] = v.center // Uses indexes on `latitudeColumn` / `longitudeColumn` if available query = query From db63dd0359205236b23a044d7da57b35ac1ee69b Mon Sep 17 00:00:00 2001 From: Sean Lynch Date: Mon, 7 Dec 2015 10:45:20 -0500 Subject: [PATCH 3/3] Stable Version 0.11.7 --- dist/js-data-sql.js | 24 ++++++++++++++++++++---- package.json | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dist/js-data-sql.js b/dist/js-data-sql.js index 06fdefe..a167300 100644 --- a/dist/js-data-sql.js +++ b/dist/js-data-sql.js @@ -436,9 +436,17 @@ module.exports = } if (op === '==' || op === '===') { - query = query.where(field, v); + if (v === null) { + query = query.whereNull(field); + } else { + query = query.where(field, v); + } } else if (op === '!=' || op === '!==') { - query = query.where(field, '!=', v); + if (v === null) { + query = query.whereNotNull(field); + } else { + query = query.where(field, '!=', v); + } } else if (op === '>') { query = query.where(field, '>', v); } else if (op === '>=') { @@ -496,9 +504,17 @@ module.exports = } else if (op === 'like') { query = query.where(field, 'like', v); } else if (op === '|==' || op === '|===') { - query = query.orWhere(field, v); + if (v === null) { + query = query.orWhereNull(field); + } else { + query = query.orWhere(field, v); + } } else if (op === '|!=' || op === '|!==') { - query = query.orWhere(field, '!=', v); + if (v === null) { + query = query.orWhereNotNull(field); + } else { + query = query.orWhere(field, '!=', v); + } } else if (op === '|>') { query = query.orWhere(field, '>', v); } else if (op === '|>=') { diff --git a/package.json b/package.json index a2f1bf3..a9c93aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "js-data-sql", "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.", - "version": "0.11.6", + "version": "0.11.7", "homepage": "http://www.js-data.io/docs/dssqladapter", "repository": { "type": "git",