From 25fa71187d3794e60f0163ceb71b9af43044852c Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Wed, 11 Nov 2015 14:43:28 +0100 Subject: [PATCH] fixed error messages --- arangod/Aql/Functions.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp index 869525188b..16472d1849 100644 --- a/arangod/Aql/Functions.cpp +++ b/arangod/Aql/Functions.cpp @@ -2292,7 +2292,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query, std::string const collectionName = vertexId.substr(0, split); if (collectionName.compare(vColName) != 0) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER, - "specified vertex collection `%s` does not match start vertex collection `%s`", + "specified vertex collection '%s' does not match start vertex collection '%s'", vColName.c_str(), collectionName.c_str()); } @@ -2300,7 +2300,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query, if (coli == nullptr) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", collectionName.c_str()); } @@ -2327,7 +2327,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query, std::string const collectionName = vertexId.substr(0, split); if (collectionName.compare(vColName) != 0) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER, - "specified vertex collection `%s` does not match start vertex collection `%s`", + "specified vertex collection '%s' does not match start vertex collection '%s'", vColName.c_str(), collectionName.c_str()); } @@ -2335,7 +2335,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query, if (coli == nullptr) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", collectionName.c_str()); } @@ -2525,7 +2525,7 @@ AqlValue Functions::Near (triagens::aql::Query* query, true, true); if (res != TRI_ERROR_NO_ERROR) { - THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", colName.c_str()); + THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", colName.c_str()); } TRI_EnsureCollectionsTransaction(trx->getInternals()); @@ -2533,7 +2533,7 @@ AqlValue Functions::Near (triagens::aql::Query* query, if (collection == nullptr) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", colName.c_str()); } } @@ -2541,9 +2541,9 @@ AqlValue Functions::Near (triagens::aql::Query* query, auto document = trx->documentCollection(cid); if (document == nullptr) { - THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", - colName.c_str()); + THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, + "'%s'", + colName.c_str()); } triagens::arango::Index* index = nullptr; @@ -2695,7 +2695,7 @@ AqlValue Functions::Within (triagens::aql::Query* query, true, true); if (res != TRI_ERROR_NO_ERROR) { - THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", colName.c_str()); + THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", colName.c_str()); } TRI_EnsureCollectionsTransaction(trx->getInternals()); @@ -2703,7 +2703,7 @@ AqlValue Functions::Within (triagens::aql::Query* query, if (collection == nullptr) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", colName.c_str()); } } @@ -2985,7 +2985,7 @@ static void RegisterCollectionInTransaction (triagens::arango::AqlTransaction* t cid = trx->resolver()->getCollectionId(collectionName); if (cid == 0) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", collectionName.c_str()); } // ensure the collection is loaded @@ -2999,7 +2999,7 @@ static void RegisterCollectionInTransaction (triagens::arango::AqlTransaction* t true, true); if (res != TRI_ERROR_NO_ERROR) { - THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", collectionName.c_str()); + THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", collectionName.c_str()); } TRI_EnsureCollectionsTransaction(trx->getInternals()); collection = trx->trxCollection(cid); @@ -3241,7 +3241,7 @@ AqlValue Functions::Edges (triagens::aql::Query* query, TRI_voc_cid_t startCid = resolver->getCollectionId(parts[0]); if (startCid == 0) { THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, - "`%s`", + "'%s'", parts[0].c_str()); }