diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js index 652bfcc665..1019585566 100644 --- a/js/common/bootstrap/errors.js +++ b/js/common/bootstrap/errors.js @@ -215,7 +215,6 @@ "ERROR_QUERY_INVALID_AGGREGATE_EXPRESSION" : { "code" : 1574, "message" : "invalid aggregate expression" }, "ERROR_QUERY_COMPILE_TIME_OPTIONS" : { "code" : 1575, "message" : "query options must be readable at query compile time" }, "ERROR_QUERY_EXCEPTION_OPTIONS" : { "code" : 1576, "message" : "query options expected" }, - "ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION" : { "code" : 1577, "message" : "collection '%s' used as expression operand" }, "ERROR_QUERY_DISALLOWED_DYNAMIC_CALL" : { "code" : 1578, "message" : "disallowed dynamic call to '%s'" }, "ERROR_QUERY_ACCESS_AFTER_MODIFICATION" : { "code" : 1579, "message" : "access after data-modification by %s" }, "ERROR_QUERY_FUNCTION_INVALID_NAME" : { "code" : 1580, "message" : "invalid user function name" }, diff --git a/lib/Basics/errors.dat b/lib/Basics/errors.dat index 80012b75a1..e6a220496e 100755 --- a/lib/Basics/errors.dat +++ b/lib/Basics/errors.dat @@ -258,7 +258,6 @@ ERROR_QUERY_MULTI_MODIFY,1573,"multi-modify query","Will be raised when an AQL q ERROR_QUERY_INVALID_AGGREGATE_EXPRESSION,1574,"invalid aggregate expression","Will be raised when an AQL query contains an invalid aggregate expression." ERROR_QUERY_COMPILE_TIME_OPTIONS,1575,"query options must be readable at query compile time","Will be raised when an AQL data-modification query contains options that cannot be figured out at query compile time." ERROR_QUERY_EXCEPTION_OPTIONS,1576,"query options expected","Will be raised when an AQL data-modification query contains an invalid options specification." -ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION,1577,"collection '%s' used as expression operand","Will be raised when a collection is used as an operand in an AQL expression." ERROR_QUERY_DISALLOWED_DYNAMIC_CALL,1578,"disallowed dynamic call to '%s'","Will be raised when a dynamic function call is made to a function that cannot be called dynamically." ERROR_QUERY_ACCESS_AFTER_MODIFICATION,1579,"access after data-modification by %s","Will be raised when collection data are accessed after a data-modification operation." diff --git a/lib/Basics/voc-errors.cpp b/lib/Basics/voc-errors.cpp index 48495c5b2c..b853d49d0d 100644 --- a/lib/Basics/voc-errors.cpp +++ b/lib/Basics/voc-errors.cpp @@ -214,7 +214,6 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_QUERY_INVALID_AGGREGATE_EXPRESSION, "invalid aggregate expression"); REG_ERROR(ERROR_QUERY_COMPILE_TIME_OPTIONS, "query options must be readable at query compile time"); REG_ERROR(ERROR_QUERY_EXCEPTION_OPTIONS, "query options expected"); - REG_ERROR(ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION, "collection '%s' used as expression operand"); REG_ERROR(ERROR_QUERY_DISALLOWED_DYNAMIC_CALL, "disallowed dynamic call to '%s'"); REG_ERROR(ERROR_QUERY_ACCESS_AFTER_MODIFICATION, "access after data-modification by %s"); REG_ERROR(ERROR_QUERY_FUNCTION_INVALID_NAME, "invalid user function name"); diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h index 8975eae51a..ec4b7640a5 100644 --- a/lib/Basics/voc-errors.h +++ b/lib/Basics/voc-errors.h @@ -1147,11 +1147,6 @@ constexpr int TRI_ERROR_QUERY_COMPILE_TIME_OPTIONS /// options specification. constexpr int TRI_ERROR_QUERY_EXCEPTION_OPTIONS = 1576; -/// 1577: ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION -/// "collection '%s' used as expression operand" -/// Will be raised when a collection is used as an operand in an AQL expression. -constexpr int TRI_ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION = 1577; - /// 1578: ERROR_QUERY_DISALLOWED_DYNAMIC_CALL /// "disallowed dynamic call to '%s'" /// Will be raised when a dynamic function call is made to a function that diff --git a/lib/Rest/GeneralResponse.cpp b/lib/Rest/GeneralResponse.cpp index 071f7777ff..d183132ca5 100644 --- a/lib/Rest/GeneralResponse.cpp +++ b/lib/Rest/GeneralResponse.cpp @@ -305,7 +305,6 @@ rest::ResponseCode GeneralResponse::responseCode(int code) { case TRI_ERROR_QUERY_MULTI_MODIFY: case TRI_ERROR_QUERY_COMPILE_TIME_OPTIONS: case TRI_ERROR_QUERY_EXCEPTION_OPTIONS: - case TRI_ERROR_QUERY_COLLECTION_USED_IN_EXPRESSION: case TRI_ERROR_QUERY_DISALLOWED_DYNAMIC_CALL: case TRI_ERROR_QUERY_ACCESS_AFTER_MODIFICATION: case TRI_ERROR_QUERY_FUNCTION_INVALID_NAME: