generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-31 16:04:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #852 from fbraem/develop

Browse Source 
Database::count() can parse different types of 'n' attribute in result.
This commit is contained in:
Aleksandar Fabijanic 2015-06-05 08:59:32 -05:00
commit 99f013f678
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MongoDB/include/Poco/MongoDB/Database.h
View File

@ -45,7 +45,7 @@ public:
virtual ~Database(); virtual ~Database();
/// Destructor /// 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 /// Sends a count request for the given collection to MongoDB. When
/// the command fails, -1 is returned. /// the command fails, -1 is returned.

15
MongoDB/src/Database.cpp
View File

@ -23,7 +23,7 @@ namespace Poco {
namespace MongoDB { 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); 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 ) if ( response.documents().size() > 0 )
{ {
Poco::MongoDB::Document::Ptr doc = response.documents()[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; return -1;

4
MongoDB/testsuite/src/MongoDBTest.cpp
View File

@ -268,7 +268,7 @@ void MongoDBTest::testDBCount2Command()
} }
Poco::MongoDB::Database db("team"); Poco::MongoDB::Database db("team");
int count = db.count(_mongo, "players"); Poco::Int64 count = db.count(_mongo, "players");
assert(count == 1); assert(count == 1);
} }
@ -306,7 +306,7 @@ void MongoDBTest::testCursorRequest()
} }
_mongo.sendRequest(*insertRequest); _mongo.sendRequest(*insertRequest);
int count = db.count(_mongo, "numbers"); Poco::Int64 count = db.count(_mongo, "numbers");
std::cout << "count= " << count << std::endl; std::cout << "count= " << count << std::endl;
assert(count == 10000); assert(count == 10000);