feathers-sequelize
Advanced tools
Comparing version 1.3.0 to 1.3.1
# Change Log | ||
## [v1.3.0](https://github.com/feathersjs/feathers-sequelize/tree/v1.3.0) (2016-07-08) | ||
[Full Changelog](https://github.com/feathersjs/feathers-sequelize/compare/v1.2.0...v1.3.0) | ||
**Fixed bugs:** | ||
- We shouldn't remove properties from original objects [\#49](https://github.com/feathersjs/feathers-sequelize/issues/49) | ||
**Merged pull requests:** | ||
- feathers-service-tests@0.6.1 breaks build 🚨 [\#50](https://github.com/feathersjs/feathers-sequelize/pull/50) ([greenkeeperio-bot](https://github.com/greenkeeperio-bot)) | ||
## [v1.2.0](https://github.com/feathersjs/feathers-sequelize/tree/v1.2.0) (2016-06-17) | ||
@@ -4,0 +15,0 @@ [Full Changelog](https://github.com/feathersjs/feathers-sequelize/compare/v1.1.6...v1.2.0) |
@@ -66,13 +66,21 @@ 'use strict'; | ||
var where = utils.getWhere(params.query); | ||
var filters = getFilter(where); | ||
var _getFilter = getFilter(params.query || {}); | ||
var filters = _getFilter.filters; | ||
var query = _getFilter.query; | ||
var where = utils.getWhere(query); | ||
var order = utils.getOrder(filters.$sort); | ||
var query = _extends({ | ||
var q = _extends({ | ||
where: where, order: order, | ||
limit: filters.$limit, | ||
offset: filters.$skip, | ||
attributes: filters.$select || null | ||
offset: filters.$skip | ||
}, params.sequelize); | ||
return this.Model.findAndCount(query).then(function (result) { | ||
if (filters.$select) { | ||
q.attributes = filters.$select; | ||
} | ||
return this.Model.findAndCount(q).then(function (result) { | ||
return { | ||
@@ -79,0 +87,0 @@ total: result.count, |
{ | ||
"name": "feathers-sequelize", | ||
"description": "A service adapter for Sequelize an SQL ORM", | ||
"version": "1.3.0", | ||
"version": "1.3.1", | ||
"homepage": "https://github.com/feathersjs/feathers-sequelize", | ||
@@ -38,3 +38,4 @@ "main": "lib/", | ||
"prepublish": "npm run compile", | ||
"publish": "git push origin && git push origin --tags", | ||
"publish": "git push origin --tags && npm run changelog && git push origin", | ||
"changelog": "github_changelog_generator && git add CHANGELOG.md && git commit -am \"Updating changelog\"", | ||
"release:patch": "npm version patch && npm publish", | ||
@@ -54,3 +55,3 @@ "release:minor": "npm version minor && npm publish", | ||
"feathers-errors": "^2.0.1", | ||
"feathers-query-filters": "^1.5.1", | ||
"feathers-query-filters": "^2.0.0", | ||
"lodash.omit": "^4.3.0", | ||
@@ -72,5 +73,5 @@ "uberproto": "^1.1.2" | ||
"mocha": "^2.5.0", | ||
"sequelize": "^3.14.1", | ||
"sequelize": "^3.23.6", | ||
"sqlite3": "^3.1.1" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
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
31976
281
+ Addedfeathers-commons@0.8.7(transitive)
+ Addedfeathers-query-filters@2.1.2(transitive)
- Removedfeathers-query-filters@1.5.1(transitive)