Skip to content

Ajustes em ftArray, JsonInterface e ClientSQL #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ronierys2 merged 1 commit into from
Sep 2, 2025
Merged

Ajustes em ftArray, JsonInterface e ClientSQL #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CORE/Source/Basic/uRESTDWBasicDB.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,13 +817,13 @@ interface
Property FieldDefs;
Property ReadData : Boolean Read GetReadData;
Property MasterDetailList : TMasterDetailList Read vMasterDetailList Write vMasterDetailList;
Property BinaryRequest : Boolean Read vBinaryRequest; // Write vBinaryRequest;
Published
Property MasterDataSet : TRESTDWClientSQL Read vMasterDataSet Write SetMasterDataSet;
{$IFDEF FPC}
Property DatabaseCharSet;
{$ENDIF}
Property MasterCascadeDelete : Boolean Read vCascadeDelete Write vCascadeDelete;
Property BinaryRequest : Boolean Read vBinaryRequest Write vBinaryRequest;
Property Datapacks : Integer Read vDatapacks Write SetDatapacks;
Property OnGetDataError : TOnEventConnection Read vOnGetDataError Write vOnGetDataError; //Recebe os Erros de ExecSQL ou de GetData
Property AfterScroll : TOnAfterScroll Read vOnAfterScroll Write vOnAfterScroll;
Expand Down
36 changes: 29 additions & 7 deletions CORE/Source/Basic/uRESTDWStorageBin.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,22 @@ interface
AStream.Read(vFieldType, SizeOf(vFieldType));
vFieldDef.DataType := DWFieldTypeToFieldType(vFieldType);
FFieldTypes[I] := vFieldType;

If vFieldType in [{$IFDEF FPC}45, {$ENDIF}dwftExtended] Then
FFieldTypes[I] := {$IFDEF FPC}Integer(ftFMTBcd){$ELSE}Integer(ftExtended){$ENDIF}
Else
FFieldTypes[I] := vFieldType;
// field size
AStream.Read(vInt, SizeOf(vInt));
If vFieldType = dwftVarBytes Then //Max Array Size
Begin
FFieldTypes[I] := Integer(ftString);
FFieldSize[I] := 255;
vInt := FFieldSize[I];
End
Else
FFieldSize[I] := vInt;
vFieldDef.Size := vInt;
FFieldSize[I] := vInt;
// field precision
AStream.Read(vInt, SizeOf(vInt));
FFieldPrecision[I] := vInt;
Expand Down Expand Up @@ -341,7 +353,13 @@ interface
FFieldTypes[I] := vFieldType;
// field size
AStream.Read(vFieldSize, SizeOf(vFieldSize));
FFieldSize[I] := vFieldSize;
If vFieldType = dwftVarBytes Then //Max Array Size
Begin
FFieldTypes[I] := Integer(ftString);
FFieldSize[I] := 255;
End
Else
FFieldSize[I] := vFieldSize;
// field precision
AStream.Read(vFieldPrecision, SizeOf(vFieldPrecision));
{$IFDEF FPC}
Expand Down Expand Up @@ -589,8 +607,9 @@ interface
End;
End;
// N Bytes - Strings
dwftVarBytes,
dwftFixedChar,
dwftString :Begin
dwftString : Begin
stream.Read(vInt64, SizeOf(vInt64));
vString := '';
If vInt64 > 0 Then
Expand All @@ -611,7 +630,7 @@ interface
Move(vString[InitStrPos], pData^, Length(vString));
{$ENDIF}
End;
End;
End;
// 1 - Byte - Inteiro
dwftByte,
dwftShortint :Begin
Expand Down Expand Up @@ -888,7 +907,7 @@ interface
dwftStream,
dwftOraBlob,
dwftBlob,
dwftBytes :Begin
dwftBytes : Begin
SetLength(vBytes, 0);
stream.Read(vInt64, SizeOf(DWInt64));
If vInt64 > 0 Then
Expand All @@ -906,7 +925,7 @@ interface
Finally
SetLength(vBytes, 0);
End;
End;
End;
// N Bytes - Others
Else
Begin
Expand Down Expand Up @@ -975,6 +994,7 @@ interface
If (FFieldTypes[i] In [dwftFixedChar,
dwftWideString,
dwftString,
dwftVarBytes,
dwftFixedWideChar]) Then
Begin
AStream.Read(vInt64, Sizeof(vInt64));
Expand Down Expand Up @@ -1291,7 +1311,7 @@ interface
dwftWideString : vByte := FieldTypeToDWFieldType(ftString);
dwftSingle : vByte := FieldTypeToDWFieldType(ftFloat);
End;
AStream.Write(vByte, SizeOf(vByte));
AStream.Write(vByte, SizeOf(vByte));
// fieldsize
vInt := ADataset.Fields[i].Size;
AStream.Write(vInt, SizeOf(vInt));
Expand Down Expand Up @@ -1427,6 +1447,7 @@ interface
Stream.Write(vString[1], vInt64);
{$ENDIF}
End;
dwftVarBytes,
dwftString : Begin
{$IFDEF RESTDWANDROID}
vString := MarshaledAString(PData);
Expand Down Expand Up @@ -1658,6 +1679,7 @@ interface
AStream.Write(vString[InitStrPos], vInt64);
End;
// N - Bytes
dwftVarBytes,
dwftString : Begin
vString := ADataset.Fields[i].AsString;
If EncodeStrs Then
Expand Down
6 changes: 3 additions & 3 deletions CORE/Source/Consts/uRESTDWConsts.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Unit uRESTDWConsts;
Unit uRESTDWConsts;

{$I ..\..\Source\Includes\uRESTDW.inc}

Expand Down Expand Up @@ -60,8 +60,8 @@

// controle de versão
RESTDWVersionINFO = 'v2.1.0-';
RESTDWRelease = '3857';
RESTDWCodeProject = 'Galaga - SourceForge';
RESTDWRelease = '3974';
RESTDWCodeProject = 'Final Fantasy X - GitHub';
RESTDWVersao = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
RESTDWDialogoTitulo = 'REST DataWare Components ' + RESTDWVersao;
RESTDWSobreTitulo = 'REST DataWare '+ RESTDWVersao;
Expand Down
3 changes: 0 additions & 3 deletions CORE/Source/Sockets/Indy/uRESTDWIdBase.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3281,7 +3281,6 @@ TIdHTTPAccess = class(TIdHTTP)
{$IFEND}
vAuthRealm := AResponseInfo.AuthRealm;
vContentType := ARequestInfo.ContentType;

If CommandExec (TComponent(AContext),
RemoveBackslashCommands(ARequestInfo.URI),
ARequestInfo.RawHTTPCommand,
Expand Down Expand Up @@ -3898,10 +3897,8 @@ function TRESTDWIdClientPooler.IsServerLive(Aip: String; Aport: Integer;
If Assigned(bJsonOBJ) Then
FreeAndNil(bJsonOBJ);
End;
{$IFNDEF FPC} //TODO XyberX
If Assigned(bJsonValue) Then
FreeAndNil(bJsonValue);
{$ENDIF}
End;
Finally
If vTempValue <> '' Then
Expand Down
Loading
Loading