correção

- Ajuste para funcionamento de IndexFieldNames Delphi velho a Novo e Lazarus(vlw Rodrigo Guelf) pela força noix sempre. - Correção do ClientConnectionDefs.
OpenSourceCommunityBrasil · Mar 19, 2024 · 02ec42c · 02ec42c
1 parent ab13cb5
commit 02ec42c
Show file tree

Hide file tree

Showing 6 changed files with 541 additions and 148 deletions.
diff --git a/CORE/Source/Basic/uRESTDWBasic.pas b/CORE/Source/Basic/uRESTDWBasic.pas
@@ -435,7 +435,8 @@  TRESTDWServerIpVersionConfig = class(TPersistent)
                                    baseEventUnit,
                                    vUrlToExec,
                                    aurlContext               : String;
-                                   Var vRequestHeader        : TStringList);
+                                   Var vRequestHeader        : TStringList;
+                                   Var vdwConnectionDefs     : TConnectionDefs);
   Function ReturnRoute            (ServerMethodsClass        : TComponent;
                                    Pooler,
                                    urlContext                : String;
@@ -2153,7 +2154,8 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
                   RequestType,  vWelcomeMessage,    vAccessTag,
                   vdwCriptKey,  compresseddata,     encodestrings,
                   dwassyncexec, vdwservereventname, baseEventUnit,
-                  vUrlToExec,   aurlContext,        vRequestHeader);
+                  vUrlToExec,   aurlContext,        vRequestHeader,
+                  vdwConnectionDefs);
      End;
      WelcomeAccept         := True;
      tmp                   := '';
@@ -3636,7 +3638,8 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
                   RequestType,  vWelcomeMessage,    vAccessTag,
                   vdwCriptKey,  compresseddata,     encodestrings,
                   dwassyncexec, vdwservereventname, baseEventUnit,
-                  vUrlToExec,   aurlContext,        vRequestHeader);
+                  vUrlToExec,   aurlContext,        vRequestHeader,
+                  vdwConnectionDefs);
      End;
      WelcomeAccept         := True;
      tmp                   := '';
@@ -4697,7 +4700,6 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
 Begin
  // lazarus iniciando com sujeira de memoria vStrings
  vStrings := nil;
-
  If ServerMethodsClass <> Nil Then
   Begin
    For I := 0 To ServerMethodsClass.ComponentCount -1 Do
@@ -5973,7 +5975,8 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
                                            baseEventUnit,
                                            vUrlToExec,
                                            aurlContext               : String;
-                                           Var vRequestHeader        : TStringList);
+                                           Var vRequestHeader        : TStringList;
+                                           Var vdwConnectionDefs     : TConnectionDefs);
 Var
  I                  : Integer;
  mb                 : TStringStream;
@@ -5994,7 +5997,6 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
  decoder            : TRESTDWMessageDecoderMIME;
  ms                 : TStream;
  vDecoderHeaderList : TStringList;
- vdwConnectionDefs  : TConnectionDefs;
  JSONValue          : TRESTDWJSONValue;
 Begin
  vDecoderHeaderList := Nil;
@@ -6446,20 +6448,16 @@ procedure TRESTDWBasicReceptor.SetAuthenticator(
      vUrlToExec := aurlContext;
    End;
  Finally
-//  If Assigned(DWParams)           Then
-//   FreeAndNil(DWParams);
   If Assigned(mb)                 Then
    FreeAndNil(mb);
-//  If Assigned(JSONParam)          Then
-//   FreeAndNil(JSONParam);
   If Assigned(newdecoder)         Then
    FreeAndNil(newdecoder);
   If Assigned(decoder)            Then
    FreeAndNil(decoder);
   If Assigned(vDecoderHeaderList) Then
    FreeAndNil(vDecoderHeaderList);
-  If Assigned(vdwConnectionDefs) Then
-   FreeAndNil(vdwConnectionDefs);
+//  If Assigned(vdwConnectionDefs) Then
+//   FreeAndNil(vdwConnectionDefs);
   If Assigned(JSONValue) Then
    FreeAndNil(JSONValue);
  End;

diff --git a/CORE/Source/Basic/uRESTDWParams.pas b/CORE/Source/Basic/uRESTDWParams.pas
@@ -4899,6 +4899,10 @@ procedure TRESTDWJSONParam.SetParamContentType(const bValue: String);
  vStringStream : TStream;
  {$IFDEF RESTDWLAZARUS}
   vFileStream  : TFileStream;
+ {$ELSE}
+  {$IF CompilerVersion < 21}
+   vFileStream  : TFileStream;
+  {$IFEND}
  {$ENDIF}
 Begin
  vStringStream := Nil;

diff --git a/CORE/Source/Basic/uRESTDWPoolermethod.pas b/CORE/Source/Basic/uRESTDWPoolermethod.pas
@@ -2491,6 +2491,14 @@ implementation
  JSONParam.ObjectDirection       := odIn;
  JSONParam.AsBoolean             := Metadata;
  DWParams.Add(JSONParam);
+ If Assigned(ConnectionDefs) Then
+  Begin
+   JSONParam                       := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
+   JSONParam.ParamName             := 'dwConnectionDefs';
+   JSONParam.ObjectDirection       := odIn;
+   JSONParam.AsString              := TConnectionDefs(ConnectionDefs).ToJSON;
+   DWParams.Add(JSONParam);
+  End;
  JSONParam                       := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
  JSONParam.ParamName             := 'Result';
  JSONParam.ObjectDirection       := odOUT;
@@ -2507,14 +2515,6 @@ implementation
  JSONParam.ObjectDirection       := odOUT;
  JSONParam.ObjectValue           := ovInteger;
  DWParams.Add(JSONParam);
- If Assigned(ConnectionDefs) Then
-  Begin
-   JSONParam                       := TRESTDWJSONParam.Create(RESTClientPoolerExec.Encoding);
-   JSONParam.ParamName             := 'dwConnectionDefs';
-   JSONParam.ObjectDirection       := odIn;
-   JSONParam.AsString              := TConnectionDefs(ConnectionDefs).ToJSON;
-   DWParams.Add(JSONParam);
-  End;
  Try
   Try
    RESTClientPoolerExec.BinaryRequest := vBinaryRequest;

diff --git a/CORE/Source/Basic/uRESTDWServerMethodClass.pas b/CORE/Source/Basic/uRESTDWServerMethodClass.pas
@@ -1,4 +1,4 @@
-unit uRESTDWServerMethodClass;
+unit uRESTDWServerMethodClass;
 
 {$I ..\Includes\uRESTDW.inc}
 

diff --git a/CORE/Source/Plugins/DMDados/uRESTDWDatamodule.pas b/CORE/Source/Plugins/DMDados/uRESTDWDatamodule.pas
@@ -1,4 +1,4 @@
-unit uRESTDWDatamodule;
+unit uRESTDWDatamodule;
 
 {$I ..\..\Includes\uRESTDW.inc}