Comparing version 2.1.10 to 2.1.11
@@ -0,1 +1,7 @@ | ||
### v2.1.11 - 19 May 2014 | ||
- Fix hasMany.getAccessor().count() | ||
### v2.1.10 - 09 May 2014 | ||
- Fix sqlite Dialect.clear - resets incremental counters (#497) | ||
### v2.1.9 - 06 May 2014 | ||
@@ -2,0 +8,0 @@ - Add basic PostGIS support - (#456, #375) |
@@ -81,3 +81,5 @@ var _ = require("lodash"); | ||
count: function (cb) { | ||
opts.driver.count(opts.table, opts.conditions, {}, function (err, data) { | ||
opts.driver.count(opts.table, opts.conditions, { | ||
merge : opts.merge | ||
}, function (err, data) { | ||
if (err || data.length === 0) { | ||
@@ -84,0 +86,0 @@ return cb(err); |
@@ -15,3 +15,3 @@ { | ||
], | ||
"version" : "2.1.10", | ||
"version" : "2.1.11", | ||
"license" : "MIT", | ||
@@ -18,0 +18,0 @@ "homepage" : "http://dresende.github.io/node-orm2", |
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
219177
59
5754