Database::count() can parse different types of 'n' attribute in result.

fbraem · fbraem · commit aaabc3c9e959 · 2015-06-03T20:34:05.000+02:00
diff --git a/MongoDB/include/Poco/MongoDB/Database.h b/MongoDB/include/Poco/MongoDB/Database.h
@@ -45,7 +45,7 @@ class MongoDB_API Database
 	virtual ~Database();
 		/// Destructor
 
-	int count(Connection& connection, const std::string& collectionName) const;
+	Int64 count(Connection& connection, const std::string& collectionName) const;
 		/// Sends a count request for the given collection to MongoDB. When
 		/// the command fails, -1 is returned.
 
diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp
@@ -23,7 +23,7 @@ namespace Poco {
 namespace MongoDB {
 
 
-Database::Database( const std::string& db) : _dbname(db)
+Database::Database(const std::string& db) : _dbname(db)
 {
 }
 
@@ -32,7 +32,7 @@ Database::~Database()
 }
 
 
-int Database::count(Connection& connection, const std::string& collectionName) const
+Int64 Database::count(Connection& connection, const std::string& collectionName) const
 {
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> countRequest = createCountRequest(collectionName);
 
@@ -42,7 +42,16 @@ int Database::count(Connection& connection, const std::string& collectionName) c
 	if ( response.documents().size() > 0 )
 	{
 		Poco::MongoDB::Document::Ptr doc = response.documents()[0];
-		return doc->get<int>("n");
+
+		if (doc->isType<double>("n")) {
+			return static_cast<Int64>(doc->get<double>("n"));
+		}
+		else if (doc->isType<Int32>("n")) {
+			return doc->get<Int32>("n");
+		}
+		else if (doc->isType<Int64>("n")) {
+			return doc->get<Int64>("n");
+		}
 	}
 
 	return -1;
diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp
@@ -268,7 +268,7 @@ void MongoDBTest::testDBCount2Command()
 	}
 
 	Poco::MongoDB::Database db("team");
-	int count = db.count(_mongo, "players");
+	Poco::Int64 count = db.count(_mongo, "players");
 	assert(count == 1);
 }
 
@@ -306,7 +306,7 @@ void MongoDBTest::testCursorRequest()
 	}
 	_mongo.sendRequest(*insertRequest);
 
-	int count = db.count(_mongo, "numbers");
+	Poco::Int64 count = db.count(_mongo, "numbers");
 	std::cout << "count= " << count << std::endl;
 	assert(count == 10000);
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace Poco {`
`23`	`23`	`namespace MongoDB {`
`24`	`24`
`25`	`25`
`26`		`-Database::Database( const std::string& db) : _dbname(db)`
	`26`	`+Database::Database(const std::string& db) : _dbname(db)`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`
`@@ -32,7 +32,7 @@ Database::~Database()`
`32`	`32`	`}`
`33`	`33`
`34`	`34`
`35`		`-int Database::count(Connection& connection, const std::string& collectionName) const`
	`35`	`+Int64 Database::count(Connection& connection, const std::string& collectionName) const`
`36`	`36`	`{`
`37`	`37`	`Poco::SharedPtr<Poco::MongoDB::QueryRequest> countRequest = createCountRequest(collectionName);`
`38`	`38`
`@@ -42,7 +42,16 @@ int Database::count(Connection& connection, const std::string& collectionName) c`
`42`	`42`	`if ( response.documents().size() > 0 )`
`43`	`43`	`{`
`44`	`44`	`Poco::MongoDB::Document::Ptr doc = response.documents()[0];`
`45`		`- return doc->get<int>("n");`
	`45`	`+`
	`46`	`+ if (doc->isType<double>("n")) {`
	`47`	`+ return static_cast<Int64>(doc->get<double>("n"));`
	`48`	`+ }`
	`49`	`+ else if (doc->isType<Int32>("n")) {`
	`50`	`+ return doc->get<Int32>("n");`
	`51`	`+ }`
	`52`	`+ else if (doc->isType<Int64>("n")) {`
	`53`	`+ return doc->get<Int64>("n");`
	`54`	`+ }`
`46`	`55`	`}`
`47`	`56`
`48`	`57`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ void MongoDBTest::testDBCount2Command()`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`Poco::MongoDB::Database db("team");`
`271`		`- int count = db.count(_mongo, "players");`
	`271`	`+ Poco::Int64 count = db.count(_mongo, "players");`
`272`	`272`	`assert(count == 1);`
`273`	`273`	`}`
`274`	`274`
`@@ -306,7 +306,7 @@ void MongoDBTest::testCursorRequest()`
`306`	`306`	`}`
`307`	`307`	`_mongo.sendRequest(*insertRequest);`
`308`	`308`
`309`		`- int count = db.count(_mongo, "numbers");`
	`309`	`+ Poco::Int64 count = db.count(_mongo, "numbers");`
`310`	`310`	`std::cout << "count= " << count << std::endl;`
`311`	`311`	`assert(count == 10000);`
`312`	`312`