Merge pull request #4 from msnraju/feature-#1/select-multiple-columns-order-by-clause

msnraju · web-flow · commit 48c3c36909d0 · 2020-11-15T20:21:24.000+05:30
ORDER BY, Multi Column Query support implemented
diff --git a/app/src/Inline Query/codeunit/InlineQuery.Codeunit.al b/app/src/Inline Query/codeunit/InlineQuery.Codeunit.al
@@ -108,4 +108,14 @@ codeunit 50104 "Inline Query"
     begin
         InlineQueryImpl.AsVariant(QueryText, ResultVariant);
     end;
+
+    /// <summary>
+    /// Apply Filters and Sorting to RecordRef from the Query.
+    /// </summary>
+    /// <param name="QueryText">The inline query text</param>
+    /// <param name="RecordRef">The RecordRef variable to be updated with Sorting and Filters</param>
+    procedure AsRecord(QueryText: Text; var RecordRef: RecordRef)
+    begin
+        InlineQueryImpl.AsRecord(QueryText, RecordRef);
+    end;
 }
diff --git a/app/src/Inline Query/codeunit/InlineQueryCompiler.Codeunit.al b/app/src/Inline Query/codeunit/InlineQueryCompiler.Codeunit.al
@@ -14,6 +14,7 @@ codeunit 50103 "Inline Query Compiler"
         JTable: JsonObject;
         JFields: JsonArray;
         JFilters: JsonArray;
+        JOrderByFields: JsonArray;
         NewJASTNode: JsonObject;
     begin
         if JASTNode.Get('Table', JToken) then
@@ -25,9 +26,13 @@ codeunit 50103 "Inline Query Compiler"
         if JASTNode.Get('Filters', JToken) then
             JFilters := CompileFilters(JToken.AsArray(), TableID);
 
+        if JASTNode.Get('OrderBy', JToken) then
+            JOrderByFields := CompileOrderByFields(JToken.AsArray(), TableID);
+
         NewJASTNode.Add('Fields', JFields);
         NewJASTNode.Add('Table', JTable);
         NewJASTNode.Add('Filters', JFilters);
+        NewJASTNode.Add('OrderBy', JOrderByFields);
 
         exit(NewJASTNode);
     end;
@@ -165,6 +170,21 @@ codeunit 50103 "Inline Query Compiler"
         exit(NewJFieldNode);
     end;
 
+    local procedure CompileOrderByFields(JFields: JsonArray; TableID: Integer): JsonArray
+    var
+        JToken: JsonToken;
+        FieldID: Integer;
+        NewJFields: JsonArray;
+    begin
+        foreach JToken in JFields do begin
+            FieldID := GetFieldID(JToken.AsValue().AsText(), TableID);
+            NewJFields.Add(FieldID);
+        end;
+
+        exit(NewJFields);
+    end;
+
+
     local procedure CompileTable(JTable: JsonObject; var TableID: Integer): JsonObject
     var
         AllObj: Record AllObj;
diff --git a/app/src/Inline Query/codeunit/InlineQueryImpl.Codeunit.al b/app/src/Inline Query/codeunit/InlineQueryImpl.Codeunit.al
@@ -9,6 +9,7 @@ codeunit 50101 "Inline Query Impl"
         EmptyQueryErr: Label 'Query should not be empty.';
         FunctionExpectedErr: Label 'Function expected.';
         SingleFunctionExpectedErr: Label 'A single function expected.';
+        SortingLbl: Label 'SORTING(%1)', Locked = true, Comment = '%1 = Field';
 
     procedure AsInteger(QueryText: Text): Integer
     var
@@ -92,6 +93,14 @@ codeunit 50101 "Inline Query Impl"
         GetFunctionValue(RecordRef, JASTNode, ValueVariant);
     end;
 
+    procedure AsRecord(QueryText: Text; var RecordRef: RecordRef)
+    var
+        JASTNode: JsonObject;
+    begin
+        JASTNode := QueryAsASTNode(QueryText);
+        PrepareRecRef(RecordRef, JASTNode);
+    end;
+
     local procedure QueryAsASTNode(QueryText: Text): JsonObject
     var
         JTokens: JsonArray;
@@ -120,7 +129,6 @@ codeunit 50101 "Inline Query Impl"
         RecCount: Integer;
         NumberValue: Decimal;
         FunctionType: Enum "Inline Query Function Type";
-        SortingLbl: Label 'SORTING(%1)', Comment = '%1 = Field';
     begin
         JASTNode.Get('Fields', JToken);
         JFields := JToken.AsArray();
@@ -149,13 +157,13 @@ codeunit 50101 "Inline Query Impl"
                 ValueVariant := RecordRef.Count();
             FunctionType::Min:
                 begin
-                    RecordRef.SetView(StrSubstNo(SortingLbl, FieldRef.Name));
+                    SetOrderBy(JASTNode, RecordRef, FieldRef.Name);
                     if RecordRef.FindFirst() then
                         ValueVariant := FieldRef.Value;
                 end;
             FunctionType::Max:
                 begin
-                    RecordRef.SetView(StrSubstNo(SortingLbl, FieldRef.Name));
+                    SetOrderBy(JASTNode, RecordRef, FieldRef.Name);
                     if RecordRef.FindLast() then
                         ValueVariant := FieldRef.Value;
                 end;
@@ -196,6 +204,12 @@ codeunit 50101 "Inline Query Impl"
         JASTNode.Get('Table', JToken);
         OpenTable(RecordRef, JToken.AsObject());
 
+        JASTNode.Get('Fields', JToken);
+        AddLoadFields(RecordRef, JToken.AsArray());
+
+        if JASTNode.Get('OrderBy', JToken) then
+            ApplyOrderBy(RecordRef, JToken.AsArray());
+
         JASTNode.Get('Filters', JToken);
         ApplyFilters(RecordRef, JToken.AsArray());
     end;
@@ -218,15 +232,43 @@ codeunit 50101 "Inline Query Impl"
             RecordRef.Open(TableID)
     end;
 
+    local procedure AddLoadFields(var RecordRef: RecordRef; JFields: JsonArray)
+    var
+        JToken: JsonToken;
+    begin
+        foreach JToken in JFields do
+            AddLoadField(RecordRef, JToken.AsObject());
+    end;
+
+    local procedure AddLoadField(var RecordRef: RecordRef; JField: JsonObject)
+    var
+        JToken: JsonToken;
+        FieldID: Integer;
+        IsFunction: Boolean;
+        FunctionType: Enum "Inline Query Function Type";
+    begin
+        JField.Get('IsFunction', JToken);
+        IsFunction := JToken.AsValue().AsBoolean();
+
+        if IsFunction then begin
+            JField.Get('Function', JToken);
+            FunctionType := "Inline Query Function Type".FromInteger(JToken.AsValue().AsInteger());
+            if FunctionType = FunctionType::Count then
+                exit;
+        end;
+
+        JField.Get('Field', JToken);
+        FieldID := JToken.AsValue().AsInteger();
+        RecordRef.AddLoadFields(FieldID);
+    end;
+
+
     local procedure ApplyFilters(var RecordRef: RecordRef; JFilters: JsonArray)
     var
         JToken: JsonToken;
     begin
-        RecordRef.FilterGroup := 2;
         foreach JToken in JFilters do
             ApplyFilter(RecordRef, JToken.AsObject());
-
-        RecordRef.FilterGroup := 0;
     end;
 
     local procedure ApplyFilter(var RecordRef: RecordRef; JFilter: JsonObject)
@@ -263,4 +305,41 @@ codeunit 50101 "Inline Query Impl"
                 FieldRef.SetFilter('>=' + FilterValue);
         end;
     end;
+
+    local procedure ApplyOrderBy(var RecordRef: RecordRef; JFields: JsonArray)
+    var
+        FieldRef: FieldRef;
+        JToken: JsonToken;
+        FieldID: Integer;
+        TableKey: Text;
+    begin
+        if JFields.Count() = 0 then
+            exit;
+
+        foreach JToken in JFields do begin
+            FieldID := JToken.AsValue().AsInteger();
+            FieldRef := RecordRef.Field(FieldID);
+            if TableKey = '' then
+                TableKey := FieldRef.Name
+            else
+                TableKey += ',' + FieldRef.Name;
+        end;
+
+        RecordRef.SetView(StrSubstNo(SortingLbl, TableKey));
+    end;
+
+    local procedure SetOrderBy(JASTNode: JsonObject; var RecordRef: RecordRef; FieldName: Text)
+    var
+        JToken: JsonToken;
+    begin
+        if not JASTNode.Get('OrderBy', JToken) then
+            exit;
+
+        if JToken.AsArray().Count() > 0 then
+            exit;
+
+        RecordRef.FilterGroup := 2;
+        RecordRef.SetView(StrSubstNo(SortingLbl, FieldName));
+        RecordRef.FilterGroup := 0;
+    end;
 }
diff --git a/app/src/Inline Query/codeunit/InlineQueryParser.Codeunit.al b/app/src/Inline Query/codeunit/InlineQueryParser.Codeunit.al
@@ -13,6 +13,7 @@ codeunit 50102 "Inline Query Parser"
         JTable: JsonObject;
         JFields: JsonArray;
         JFilters: JsonArray;
+        JOrderByFields: JsonArray;
         JASTNode: JsonObject;
     begin
         if JTokens.Count() = 0 then
@@ -25,12 +26,14 @@ codeunit 50102 "Inline Query Parser"
         JFields := ParseFields(JTokens, Pos);
         JTable := ParseTable(JTokens, Pos);
         JFilters := ParseFilters(JTokens, Pos);
+        JOrderByFields := ParseOrderBy(JTokens, Pos);
 
         EndOfQuery(JTokens, Pos);
 
         JASTNode.Add('Fields', JFields);
         JASTNode.Add('Table', JTable);
         JASTNode.Add('Filters', JFilters);
+        JASTNode.Add('OrderBy', JOrderByFields);
 
         exit(JASTNode);
     end;
@@ -72,7 +75,7 @@ codeunit 50102 "Inline Query Parser"
             exit;
 
         if UpperCase(TokenValue) <> 'WHERE' then
-            Error(SyntaxErrorErr, 'WHERE');
+            exit;
 
         Pos += 1;
 
@@ -116,6 +119,45 @@ codeunit 50102 "Inline Query Parser"
         exit(JFilters);
     end;
 
+    local procedure ParseOrderBy(JTokens: JsonArray; var Pos: Integer): JsonArray
+    var
+        TokenValue: Text;
+        TokenType: Enum "Inline Query Token Type";
+        FieldName: Text;
+        JFields: JsonArray;
+    begin
+        if not PeekToken(JTokens, Pos, TokenValue, TokenType) then
+            exit;
+
+        if UpperCase(TokenValue) <> 'ORDER' then
+            exit;
+
+        Pos += 1;
+
+        if not ReadToken(JTokens, Pos, TokenValue, TokenType) then
+            Error(SyntaxErrorErr, 'ORDER');
+
+        if UpperCase(TokenValue) <> 'BY' then
+            Error(SyntaxErrorErr, 'BY');
+
+
+        while (UpperCase(TokenValue) = 'BY') or (TokenValue = ',') do begin
+            if not ReadToken(JTokens, Pos, TokenValue, TokenType) then
+                Error(SyntaxErrorErr, 'Field');
+
+            FieldName := TokenValue;
+            JFields.Add(FieldName);
+
+            if not PeekToken(JTokens, Pos, TokenValue, TokenType) then
+                Break;
+
+            if TokenValue = ',' then
+                Pos += 1;
+        end;
+
+        exit(JFields);
+    end;
+
     local procedure ParseTable(JTokens: JsonArray; var Pos: Integer): JsonObject
     var
         TokenValue: Text;
diff --git a/app/src/test/CustomerListExt.PageExt.al b/app/src/test/CustomerListExt.PageExt.al
diff --git a/app/src/test/InlineQueryTest.Page.al b/app/src/test/InlineQueryTest.Page.al
@@ -17,6 +17,7 @@ page 50100 "Inline Query Test"
             field("Result"; Result)
             {
                 Editable = false;
+                MultiLine = true;
                 ApplicationArea = All;
                 ToolTip = 'The Query Result';
                 Caption = 'Result';
@@ -41,10 +42,16 @@ page 50100 "Inline Query Test"
 
                 trigger OnAction()
                 var
+                    RecordRef: RecordRef;
                     ResultVariant: Variant;
                 begin
                     Result := '';
-                    InlineQuery.AsVariant(QueryText, ResultVariant);
+                    InlineQuery.AsRecord(QueryText, ResultVariant);
+                    if ResultVariant.IsRecordRef then begin
+                        RecordRef := ResultVariant;
+                        Message('%1', RecordRef.GetView());
+                    end;
+
                     Result := Format(ResultVariant);
                 end;
             }
diff --git a/test/src/InlineQueryTests.Codeunit.al b/test/src/InlineQueryTests.Codeunit.al
