The driver now validates the filter if it's wrong creates an exceptio…

…n to be shown in the shell
hecogo · Sep 18, 2012 · 5a42135 · 5a42135
1 parent 4733e26
commit 5a42135
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/db/driverbase/connection.cpp b/db/driverbase/connection.cpp
@@ -236,13 +236,20 @@ BSONObj* Connection::findByKey(const std::string& db, const std::string& ns, con
 	return bsonresult;
 }
 
-std::vector<BSONObj*>* Connection::find(const std::string& db, const std::string& ns, const std::string& filter) {
+std::vector<BSONObj*>* Connection::find(const std::string& db, const std::string& ns, const std::string& filter) throw(ParseException) {
 	return find(db, ns, "*", filter);
 }
 
-std::vector<BSONObj*>* Connection::find(const std::string& db, const std::string& ns, const std::string& select, const std::string& filter) {
+std::vector<BSONObj*>* Connection::find(const std::string& db, const std::string& ns, const std::string& select, const std::string& filter) throw(ParseException) {
 	if (_logger->isDebug()) _logger->debug("executing find db: %s, ns: %s, select: %s, filter: %s", db.c_str(), ns.c_str(), select.c_str(), filter.c_str());
 
+	try {
+		FilterParser* parser = FilterParser::parse(filter);
+		delete parser;
+	} catch (ParseException e) {
+		_logger->error("An error ocurred parsing the filter %s", filter.c_str());
+		throw e;
+	}
 	FindCommand cmd;
 	cmd.setFilter(filter);
 	cmd.setSelect(select);

diff --git a/db/driverbase/connection.h b/db/driverbase/connection.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include "bson.h"
 #include "util.h"
+#include "filterparser.h"
 
 #ifdef WINDOWS
    #define LibraryExport   __declspec( dllexport )
@@ -43,8 +44,8 @@ namespace djondb {
             bool insert(const std::string& db, const std::string& ns, const BSONObj& obj);
             BSONObj* findByKey(const std::string& db, const std::string& ns, const std::string& select, const std::string& id);
             BSONObj* findByKey(const std::string& db, const std::string& ns, const std::string& id);
-				std::vector<BSONObj*>* find(const std::string& db, const std::string& ns, const std::string& select, const std::string& filter);
-				std::vector<BSONObj*>* find(const std::string& db, const std::string& ns, const std::string& filter);
+				std::vector<BSONObj*>* find(const std::string& db, const std::string& ns, const std::string& select, const std::string& filter) throw(ParseException);
+				std::vector<BSONObj*>* find(const std::string& db, const std::string& ns, const std::string& filter) throw(ParseException);
             bool update(const std::string& db, const std::string& ns, const std::string& json);
             bool update(const std::string& db, const std::string& ns, const BSONObj& bson);
 

diff --git a/db/shell/shell.cpp b/db/shell/shell.cpp
@@ -416,25 +416,29 @@ v8::Handle<v8::Value> find(const v8::Arguments& args) {
 		}
 		*/
 
-	std::vector<BSONObj*>* result = __djonConnection->find(db, ns, select, filter);
-
-	std::stringstream ss;
-	ss << "[";
-	if (result->size() > 0) {
-		for (std::vector<BSONObj*>::const_iterator i = result->begin(); i != result->end(); i++) {
-			BSONObj* obj = *i;
-			if (i != result->begin()) {
-				ss << ", ";
+	try {
+		std::vector<BSONObj*>* result = __djonConnection->find(db, ns, select, filter);
+
+		std::stringstream ss;
+		ss << "[";
+		if (result->size() > 0) {
+			for (std::vector<BSONObj*>::const_iterator i = result->begin(); i != result->end(); i++) {
+				BSONObj* obj = *i;
+				if (i != result->begin()) {
+					ss << ", ";
+				}
+				ss << obj->toChar();
 			}
-			ss << obj->toChar();
 		}
-	}
-	ss << "]";
+		ss << "]";
 
-	std::string sresult = ss.str();
+		std::string sresult = ss.str();
 
-	delete result;
-	return parseJSON(v8::String::New(sresult.c_str()));
+		delete result;
+		return parseJSON(v8::String::New(sresult.c_str()));
+	} catch (ParseException e) {
+		return v8::ThrowException(v8::String::New("the filter expression contains an error\n"));
+	}
 /* 
 	v8::Handle<v8::Context> context = v8::Context::GetCurrent();
 	v8::Handle<v8::Object> global = context->Global();

diff --git a/db/shell/shell.vcproj b/db/shell/shell.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\third_party\includes;..\util;C:\development\boost;..\bson;..\driverbase"
+				AdditionalIncludeDirectories="..\third_party\includes;..\util;..\db;C:\development\boost;..\bson;..\driverbase"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\third_party\includes;..\util;C:\development\boost;..\bson;..\driverbase"
+				AdditionalIncludeDirectories="..\third_party\includes;..\util;..\db;C:\development\boost;..\bson;..\driverbase"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"