Fix hasMany.getAccessor().count()

dxg · dxg · commit b76073732e32 · 2014-05-19T10:53:21.000+10:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,9 @@
+### 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
 - Add basic PostGIS support - (#456, #375)
 - Allow mapping model properties to differently named columns (#273, #495)
diff --git a/lib/ChainFind.js b/lib/ChainFind.js
@@ -78,7 +78,9 @@ function ChainFind(Model, opts) {
 			return this;
 		},
 		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) {
 					return cb(err);
 				}
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
 		"sqlite",
 		"mongodb"
 	],
-	"version"     : "2.1.10",
+	"version"     : "2.1.11",
 	"license"     : "MIT",
 	"homepage"    : "http://dresende.github.io/node-orm2",
 	"repository"  : "http://github.com/dresende/node-orm2.git",
diff --git a/test/integration/association-hasmany.js b/test/integration/association-hasmany.js
@@ -152,6 +152,32 @@ describe("hasMany", function () {
 				return done();
 			});
 		});
+
+		it("should allow chaining count()", function (done) {
+			Person.find({}, function (err, people) {
+				should.equal(err, null);
+
+				people[0].getPets().count(function (err, count) {
+					should.not.exist(err);
+
+					should.strictEqual(count, 2);
+
+					people[1].getPets().count(function (err, count) {
+						should.not.exist(err);
+
+						should.strictEqual(count, 1);
+
+						people[2].getPets().count(function (err, count) {
+							should.not.exist(err);
+
+							should.strictEqual(count, 0);
+
+							return done();
+						});
+					});
+				});
+			});
+		});
 	});
 
 	describe("hasAccessor", function () {
diff --git a/test/integration/orm-exports.js b/test/integration/orm-exports.js
@@ -72,7 +72,7 @@ describe("ORM.connect()", function () {
 	});
 
 	it("should allow protocol alias", function (done) {
-		var db = ORM.connect("pg://unknowndb");
+		var db = ORM.connect("pg://127.0.0.2");
 
 		db.on("connect", function (err) {
 			should.exist(err);
