Merge remote-tracking branch 'remotes/origin/dev'

Author: mobius1qwe

pkg/Delphi/PascalRAL.dpk

@@ -52,7 +52,7 @@ contains
   RALCripto in '..\..\src\utils\RALCripto.pas',
   RALCriptoAES in '..\..\src\utils\RALCriptoAES.pas',
   RALCustomObjects in '..\..\src\utils\RALCustomObjects.pas',
-  RALHashes in '..\..\src\utils\RALHashes.pas',
+  RALHashBase in '..\..\src\utils\RALHashBase.pas',
   RALJson in '..\..\src\utils\RALJson.pas',
   RALMD5 in '..\..\src\utils\RALMD5.pas',
   RALMIMETypes in '..\..\src\utils\RALMIMETypes.pas',
@@ -72,6 +72,7 @@ contains
   RALStorageCSV in '..\..\src\utils\RALStorageCSV.pas',
   RALStorageJSON in '..\..\src\utils\RALStorageJSON.pas',
   RALStorageBIN in '..\..\src\utils\RALStorageBIN.pas',
-  RALDBTypes in '..\..\src\base\RALDBTypes.pas';
+  RALDBTypes in '..\..\src\base\RALDBTypes.pas',
+  RALHashes in '..\..\src\utils\RALHashes.pas';
 
 end.

pkg/Delphi/PascalRAL.dproj

@@ -191,7 +191,7 @@
         <DCCReference Include="..\..\src\utils\RALCripto.pas"/>
         <DCCReference Include="..\..\src\utils\RALCriptoAES.pas"/>
         <DCCReference Include="..\..\src\utils\RALCustomObjects.pas"/>
-        <DCCReference Include="..\..\src\utils\RALHashes.pas"/>
+        <DCCReference Include="..\..\src\utils\RALHashBase.pas"/>
         <DCCReference Include="..\..\src\utils\RALJson.pas"/>
         <DCCReference Include="..\..\src\utils\RALMD5.pas"/>
         <DCCReference Include="..\..\src\utils\RALMIMETypes.pas"/>
@@ -212,6 +212,7 @@
         <DCCReference Include="..\..\src\utils\RALStorageJSON.pas"/>
         <DCCReference Include="..\..\src\utils\RALStorageBIN.pas"/>
         <DCCReference Include="..\..\src\base\RALDBTypes.pas"/>
+        <DCCReference Include="..\..\src\utils\RALHashes.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

src/base/RALClient.pas

@@ -128,7 +128,7 @@   TRALClient = class(TRALComponent)
     /// event called when client thread finishes
     procedure OnThreadResponse(Sender: TObject; AResponse: TRALResponse; AException: StringRAL);
 
-    function CreateClient : TRALClientHTTP;
+    function CreateClient: TRALClientHTTP;
     /// Copy all properties of current TRALClientBase object
     procedure CopyProperties(ADest: TRALClient); virtual;
 
@@ -148,31 +148,31 @@   TRALClient = class(TRALComponent)
     function Clone(AOwner: TComponent = nil): TRALClient; virtual;
 
     /// Defines method on the client: Delete.
-    procedure Delete(ARoute : StringRAL; var AResponse : TRALResponse); overload;
-    procedure Delete(ARoute : StringRAL; AOnResponse: TRALThreadClientResponse = nil;
+    procedure Delete(ARoute: StringRAL; var AResponse : TRALResponse); overload;
+    procedure Delete(ARoute: StringRAL; AOnResponse: TRALThreadClientResponse = nil;
                      AExecBehavior : TRALExecBehavior = ebMultiThread); overload;
 
     /// Defines method on the client: Get.
-    procedure Get(ARoute : StringRAL; var AResponse : TRALResponse); overload;
-    procedure Get(ARoute : StringRAL; AOnResponse: TRALThreadClientResponse = nil;
+    procedure Get(ARoute: StringRAL; var AResponse : TRALResponse); overload;
+    procedure Get(ARoute: StringRAL; AOnResponse: TRALThreadClientResponse = nil;
                   AExecBehavior : TRALExecBehavior = ebMultiThread); overload;
 
     /// Defines method on the client: Patch.
-    procedure Patch(ARoute : StringRAL; var AResponse : TRALResponse); overload;
-    procedure Patch(ARoute : StringRAL; AOnResponse: TRALThreadClientResponse = nil;
+    procedure Patch(ARoute: StringRAL; var AResponse : TRALResponse); overload;
+    procedure Patch(ARoute: StringRAL; AOnResponse: TRALThreadClientResponse = nil;
                     AExecBehavior : TRALExecBehavior = ebMultiThread); overload;
 
     /// Defines method on the client: Post.
-    procedure Post(ARoute : StringRAL; var AResponse : TRALResponse); overload;
-    procedure Post(ARoute : StringRAL; AOnResponse: TRALThreadClientResponse = nil;
+    procedure Post(ARoute: StringRAL; var AResponse : TRALResponse); overload;
+    procedure Post(ARoute: StringRAL; AOnResponse: TRALThreadClientResponse = nil;
                    AExecBehavior : TRALExecBehavior = ebMultiThread); overload;
 
     /// Defines method on the client: Put.
-    procedure Put(ARoute : StringRAL; var AResponse : TRALResponse); overload;
-    procedure Put(ARoute : StringRAL; AOnResponse: TRALThreadClientResponse = nil;
-                  AExecBehavior : TRALExecBehavior = ebMultiThread); overload;
+    procedure Put(ARoute: StringRAL; var AResponse : TRALResponse); overload;
+    procedure Put(ARoute: StringRAL; AOnResponse: TRALThreadClientResponse = nil;
+                  AExecBehavior: TRALExecBehavior = ebMultiThread); overload;
 
-    property Request : TRALRequest read FRequest;
+    property Request: TRALRequest read FRequest;
   published
     property Authentication: TRALAuthClient read FAuthentication write SetAuthentication;
     property BaseURL: TStrings read FBaseURL write SetBaseURL;
@@ -304,7 +304,7 @@ procedure TRALClient.ExecuteThread(ARoute: StringRAL; AMethod: TRALMethod;
 function TRALClient.ExecuteSingle(ARoute: StringRAL; AMethod: TRALMethod): TRALResponse;
 var
   vClient: TRALClientHTTP;
-  vRequest : TRALRequest;
+  vRequest: TRALRequest;
 begin
   Result := TRALClientResponse.Create(Self);
   vRequest := TRALClientRequest.Create(Self);

src/base/RALConsts.pas

@@ -13,9 +13,9 @@ interface
 
 const
   // Versionamento
-  RALVERSION = '0.11.0-13 alpha';
+  RALVERSION = '0.12.0-4 beta';
   RALVERSION_MAJOR = 0;
-  RALVERSION_MINOR = 11;
+  RALVERSION_MINOR = 12;
   RALVERSION_PATCH = 0;
   RALVERSION_FULL  = RALVERSION_MAJOR * 10000
                    + RALVERSION_MINOR * 100
@@ -28,6 +28,11 @@ interface
   RALPACKAGESITE           = 'https://github.com/OpenSourceCommunityBrasil/PascalRAL';
   RALPACKAGELICENSE        = 'OpenSource';
   RALPACKAGELICENSEVERSION = 'OpenSource - v' + RALVERSION;
+  ENGINESYNOPSE            = 'mORMot2';
+  ENGINEINDY               = 'Indy';
+  ENGINESAGUI              = 'Sagui';
+  ENGINENETHTTP            = 'netHttp';
+  ENGINEFPHTTP             = 'fpHttp';
 
   // html pages
   RALDefaultPage = '<!DOCTYPE html>'

src/base/RALDBTypes.pas

@@ -157,7 +157,7 @@   TRALDBInfoTable = class
 
   TRALDBInfoTables = class
   private
-    FTables : TList;
+    FTables: TList;
   protected
     function GetAsJSON: StringRAL;
     function GetAsJSONObj: TRALJSONArray;
@@ -378,7 +378,7 @@ class procedure TRALDB.ParseSQLParams(ASQL: StringRAL; AParams: TParams);
 
     for vInt := POSINISTR to RALHighStr(ASQL) do
     begin
-      vSQLChar := ASQL[vInt];
+      vSQLChar := CharRAL(ASQL[vInt]);
       if (vSQLChar = '''') and (not vEspaceDoubleQuote) and
         (not (vEscapeQuote and (vChar = '\'))) then
       begin