Added keywords for 'left' and 'right' and respective function calls

Author: ezrahaleva-msft

Microsoft.Azure.Cosmos/src/Query/Core/Parser/CstToAstVisitor.cs

@@ -571,10 +571,34 @@ public override SqlObject VisitExistsScalarExpression([NotNull] sqlParser.Exists
         public override SqlObject VisitFunctionCallScalarExpression([NotNull] sqlParser.FunctionCallScalarExpressionContext context)
         {
             Contract.Requires(context != null);
-            // (K_UDF '.')? identifier '(' scalar_expression_list? ')'
+            Contract.Requires(context.function_call_scalar_expression != null);
+
+            return this.Visit(context.function_call_scalar_expression());
+        }
+
+        public override SqlObject VisitFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context)
+        {
+            Contract.Requires(context != null);
+            // : (K_UDF '.')? identifier '(' scalar_expression_list ? ')'
+            // | K_LEFT '(' scalar_expression_list ? ')'
+            // | K_RIGHT '(' scalar_expression_list ? ')'
 
             bool udf = context.K_UDF() != null;
-            SqlIdentifier identifier = SqlIdentifier.Create(context.identifier().GetText());
+            SqlIdentifier identifier;
+
+            if (context.identifier() != null)
+            {
+                identifier = SqlIdentifier.Create(context.identifier().GetText());
+            }
+            else if (context.K_LEFT() != null) 
+            {
+                identifier = SqlIdentifier.Create(context.K_LEFT().GetText());
+            }
+            else
+            {
+                identifier = SqlIdentifier.Create(context.K_RIGHT().GetText());
+            }
+
             List<SqlScalarExpression> arguments = new List<SqlScalarExpression>();
             if (context.scalar_expression_list() != null)
             {

Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlListener.cs

@@ -682,6 +682,16 @@ internal interface IsqlListener : IParseTreeListener {
 	/// <param name="context">The parse tree.</param>
 	void ExitPropertyRefScalarExpressionRecursive([NotNull] sqlParser.PropertyRefScalarExpressionRecursiveContext context);
 	/// <summary>
+	/// Enter a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context);
+	/// <summary>
 	/// Enter a parse tree produced by <see cref="sqlParser.scalar_expression_list"/>.
 	/// </summary>
 	/// <param name="context">The parse tree.</param>

Microsoft.Azure.Cosmos/src/Query/Core/Parser/IsqlVisitor.cs

@@ -417,6 +417,12 @@ internal interface IsqlVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitPropertyRefScalarExpressionRecursive([NotNull] sqlParser.PropertyRefScalarExpressionRecursiveContext context);
 	/// <summary>
+	/// Visit a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	Result VisitFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context);
+	/// <summary>
 	/// Visit a parse tree produced by <see cref="sqlParser.scalar_expression_list"/>.
 	/// </summary>
 	/// <param name="context">The parse tree.</param>

Microsoft.Azure.Cosmos/src/Query/Core/Parser/sql.g4

@@ -166,16 +166,22 @@ primary_expression
     | literal #LiteralScalarExpression
     | '[' scalar_expression_list? ']' #ArrayCreateScalarExpression
     | '{' object_property_list? '}' #ObjectCreateScalarExpression
-    | (K_UDF '.')? identifier '(' scalar_expression_list? ')' #FunctionCallScalarExpression
     | '(' scalar_expression ')' #ParenthesizedScalarExperession
     | '(' sql_query ')' #SubqueryScalarExpression
     | primary_expression '.' identifier #PropertyRefScalarExpressionRecursive
     | primary_expression '[' scalar_expression  ']' #MemberIndexerScalarExpression
     | K_EXISTS '(' sql_query ')' #ExistsScalarExpression
     | K_ARRAY '(' sql_query ')' #ArrayScalarExpression
     | K_ALL '(' sql_query ')' #AllScalarExpression
+    | function_call_scalar_expression #FunctionCallScalarExpression
     ;
 
+function_call_scalar_expression
+	: (K_UDF '.')? identifier '(' scalar_expression_list? ')'
+	| K_LEFT '(' scalar_expression_list? ')'
+	| K_RIGHT '(' scalar_expression_list? ')' 
+	;
+
 scalar_expression_list : scalar_expression (',' scalar_expression)*;
 
 object_property_list : object_property (',' object_property)* ;
@@ -207,13 +213,15 @@ K_FROM : F R O M;
 K_GROUP : G R O U P;
 K_IN : I N ;
 K_JOIN : J O I N;
+K_LEFT : L E F T;
 K_LIKE : L I K E;
 K_LIMIT : L I M I T;
 K_NOT : N O T;
 K_NULL : 'null';
 K_OFFSET : O F F S E T;
 K_OR : O R;
 K_ORDER : O R D E R;
+K_RIGHT : R I G H T;
 K_SELECT : S E L E C T;
 K_TOP : T O P;
 K_TRUE : 'true';
@@ -270,8 +278,7 @@ fragment SAFECODEPOINTWITHDOUBLEQUOTATION
     ;
 
 LEX_IDENTIFIER
-    : 
-    | [a-zA-Z_]([a-zA-Z_]|DIGIT)*
+    : [a-zA-Z_]([a-zA-Z_]|DIGIT)*
     ;
 
 PARAMETER

Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlBaseListener.cs

@@ -806,6 +806,18 @@ public virtual void EnterPropertyRefScalarExpressionRecursive([NotNull] sqlParse
 	/// <param name="context">The parse tree.</param>
 	public virtual void ExitPropertyRefScalarExpressionRecursive([NotNull] sqlParser.PropertyRefScalarExpressionRecursiveContext context) { }
 	/// <summary>
+	/// Enter a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// <para>The default implementation does nothing.</para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	public virtual void EnterFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context) { }
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// <para>The default implementation does nothing.</para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	public virtual void ExitFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context) { }
+	/// <summary>
 	/// Enter a parse tree produced by <see cref="sqlParser.scalar_expression_list"/>.
 	/// <para>The default implementation does nothing.</para>
 	/// </summary>

Microsoft.Azure.Cosmos/src/Query/Core/Parser/sqlBaseVisitor.cs

@@ -659,6 +659,16 @@ internal partial class sqlBaseVisitor<Result> : AbstractParseTreeVisitor<Result>
 	/// <return>The visitor result.</return>
 	public virtual Result VisitPropertyRefScalarExpressionRecursive([NotNull] sqlParser.PropertyRefScalarExpressionRecursiveContext context) { return VisitChildren(context); }
 	/// <summary>
+	/// Visit a parse tree produced by <see cref="sqlParser.function_call_scalar_expression"/>.
+	/// <para>
+	/// The default implementation returns the result of calling <see cref="AbstractParseTreeVisitor{Result}.VisitChildren(IRuleNode)"/>
+	/// on <paramref name="context"/>.
+	/// </para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	public virtual Result VisitFunction_call_scalar_expression([NotNull] sqlParser.Function_call_scalar_expressionContext context) { return VisitChildren(context); }
+	/// <summary>
 	/// Visit a parse tree produced by <see cref="sqlParser.scalar_expression_list"/>.
 	/// <para>
 	/// The default implementation returns the result of calling <see cref="AbstractParseTreeVisitor{Result}.VisitChildren(IRuleNode)"/>