Remove [NOT] BETWEEN operator

[NOT] BETWEEN operator is not supported in AMQP SQL

Author: ansd

deps/rabbit/src/rabbit_amqp_filter_sql.erl

@@ -158,12 +158,6 @@ eval0({unary_minus, Expr}, Msg) ->
     end;
 
 %% Special operators
-eval0({'between', Expr, From, To}, Msg) ->
-    Value = eval0(Expr, Msg),
-    FromVal = eval0(From, Msg),
-    ToVal = eval0(To, Msg),
-    between(Value, FromVal, ToVal);
-
 eval0({'in', Expr, ValueList}, Msg) ->
     Value = eval0(Expr, Msg),
     is_in(Value, ValueList);
@@ -218,21 +212,6 @@ arithmetic('/', Left, Right) when is_number(Left) andalso is_number(Right) andal
 arithmetic(_, _, _) ->
     undefined.
 
-between(Value, From, To)
-  when Value =:= undefined orelse
-       From =:= undefined orelse
-       To =:= undefined ->
-    undefined;
-between(Value, From, To)
-  when is_number(Value) andalso
-       is_number(From) andalso
-       is_number(To) ->
-    From =< Value andalso Value =< To;
-between(_, _, _) ->
-    %% BETWEEN requires arithmetic expressions
-    %% "a string cannot be used in an arithmetic expression"
-    false.
-
 is_in(undefined, _) ->
     %% "If identifier of an IN or NOT IN operation is NULL,
     %% the value of the operation is unknown."

deps/rabbit/src/rabbit_amqp_sql_ast.erl

@@ -76,9 +76,6 @@ has_binary_identifier_test() ->
     true = has_binary_identifier("custom_metric * 10 < 100"),
     true = has_binary_identifier("properties.creation-time >= 12345 OR user_data = 'test'"),
 
-    false = has_binary_identifier("properties.group-sequence BETWEEN 1 AND 10"),
-    true = has_binary_identifier("user_score BETWEEN 1 AND 10"),
-
     false = has_binary_identifier("properties.group-id LIKE 'group_%' ESCAPE '!'"),
     true = has_binary_identifier("user_tag LIKE 'group_%' ESCAPE '!'"),
 
@@ -87,10 +84,10 @@ has_binary_identifier_test() ->
 
     false = has_binary_identifier(
               "(properties.group-sequence + 1) * 2 <= 100 AND " ++
-              "(properties.group-id LIKE 'prod_%' OR header.priority BETWEEN 5 AND 10)"),
+              "(properties.group-id LIKE 'prod_%' OR h.priority > 5)"),
     true = has_binary_identifier(
              "(properties.group-sequence + 1) * 2 <= 100 AND " ++
-             "(user_value LIKE 'prod_%' OR properties.absolute-expiry-time BETWEEN 5 AND 10)"),
+             "(user_value LIKE 'prod_%' OR p.absolute-expiry-time < 10)"),
     ok.
 
 has_binary_identifier(Selector) ->

deps/rabbit/src/rabbit_amqp_sql_lexer.erl

@@ -27,7 +27,6 @@ Rules.
 [nN][oO][tT]   : {token, {'NOT', TokenLine}}.
 
 % Special operators (case insensitive)
-[bB][eE][tT][wW][eE][eE][nN] : {token, {'BETWEEN', TokenLine}}.
 [lL][iI][kK][eE]             : {token, {'LIKE', TokenLine}}.
 [iI][nN]                     : {token, {'IN', TokenLine}}.
 [iI][sS]                     : {token, {'IS', TokenLine}}.