Improved AcceptedResponse and RQL message errors

danieleteti · Feb 4, 2025 · dbe00bf · dbe00bf
1 parent 597faaa
commit dbe00bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/sources/MVCFramework.RQL.Parser.pas b/sources/MVCFramework.RQL.Parser.pas
@@ -622,6 +622,10 @@ procedure TRQL2SQL.ParseBinOperator(const aToken: TRQLToken; const aAST: TObject
       Error('Unclosed string');
     lValueType := vtString;
   end
+  else if lToken = tkQuote then {special error case}
+  begin
+    Error('String literals must be enclosed in Double Quotes - HINT: Convert single quotes into double quotes ( '' -> " )');
+  end
   else if (aToken in [tkIn, tkOut]) and (lToken = tkOpenBracket) then
   begin
     lList := TList<string>.Create;

diff --git a/sources/MVCFramework.pas b/sources/MVCFramework.pas
@@ -786,7 +786,7 @@   TMVCRenderer = class(TMVCBase)
     function CreatedResponse(const Location: string = ''; const Body: TObject = nil): IMVCResponse; overload;
     function CreatedResponse(const Location: string; const Message: String): IMVCResponse; overload;
 
-    function AcceptedResponse(const Location: string = ''; const Body: TObject = nil): IMVCResponse;
+    function AcceptedResponse(const Location: string = ''; const Body: TObject = nil; const Message: String = ''): IMVCResponse; overload;
 
     function ConflictResponse: IMVCResponse;
 
@@ -3943,7 +3943,7 @@ function TMVCController.GetClientId: string;
 end;
 
 function TMVCRenderer.AcceptedResponse(const Location: string;
-  const Body: TObject): IMVCResponse;
+  const Body: TObject; const Message: String): IMVCResponse;
 var
   lRespBuilder: IMVCResponseBuilder;
 begin
@@ -3956,6 +3956,10 @@ function TMVCRenderer.AcceptedResponse(const Location: string;
   begin
     lRespBuilder.Body(Body, True);
   end;
+  if not Message.IsEmpty then
+  begin
+    lRespBuilder.Body(Message);
+  end;
   Result := lRespBuilder.StatusCode(HTTP_STATUS.Accepted).Build;
 end;