Skip to content
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

Modifications to avoid error with keys that starts with numbers #143

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Modifications to avoid error with keys that starts with numbers #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc5658f
Delphi 7 RES file
alansbraga May 14, 2018
82003cc
Merge branch 'fabriciocolombo:master' into master
renatorubinho May 11, 2021
e52a8de
Modifications to avoid error with keys that starts with numbers
renatorubinho May 12, 2021
9d6c1f8
Modifications to avoid error with Fields that exceeds 31 chars
renatorubinho Nov 4, 2022
c9c0769
Modifications to:
renatorubinho Jun 30, 2023
87831ba
Modifications to avoid error with Fields that exceeds 31 chars
renatorubinho Mar 18, 2024
bc0e769
Merge branch 'M0456988-API_FACILITA_IMPLEMENTACAO'
renatorubinho Mar 18, 2024
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
12 changes: 10 additions & 2 deletions lib/superobject/superobject.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3597,7 +3597,11 @@ class function TSuperObject.ParseEx(tok: TSuperTokenizer; str: PSOChar; len: int
begin
if (v = tok.quote_char) then
begin
TokRec^.field_name := tok.pb.FBuf;
if (tok.pb.FBuf<>'') and
(not(Ord(tok.pb.FBuf[0]) in [65..90, 97..122]))then
TokRec^.field_name := '_' + String( tok.pb.FBuf )
else
TokRec^.field_name := tok.pb.FBuf;
TokRec^.saved_state := tsObjectFieldEnd;
TokRec^.state := tsEatws;
end else
Expand All @@ -3615,7 +3619,11 @@ class function TSuperObject.ParseEx(tok: TSuperTokenizer; str: PSOChar; len: int
begin
if (SOIChar(v) < 256) and (AnsiChar(v) in [':', #0]) then
begin
TokRec^.field_name := tok.pb.FBuf;
if (tok.pb.FBuf<>'') and
(not(Ord(tok.pb.FBuf[0]) in [65..90, 97..122]))then
TokRec^.field_name := '_' + String( tok.pb.FBuf )
else
TokRec^.field_name := tok.pb.FBuf;
TokRec^.saved_state := tsObjectFieldEnd;
TokRec^.state := tsEatws;
goto redo_char;
Expand Down
Binary file added packages/D7/D7_RestApi.res
View file
Open in desktop
Binary file not shown.
28 changes: 26 additions & 2 deletions src/DataSetUtils.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TDataSetUtils = class
public
class function CreateField(DataSet: TDataSet; FieldType: TFieldType; const FieldName: string = ''; ASize: Integer=0; ADisplayWidth: Integer = 30): TField;
class function CreateDataSetField(DataSet: TDataSet; const FieldName: string): TDataSetField;
class function RetFieldName(DataSet: TDataSet; FieldName: string): string;
end;

implementation
Expand All @@ -17,7 +18,7 @@ implementation

class function TDataSetUtils.CreateDataSetField(DataSet: TDataSet;const FieldName: string): TDataSetField;
begin
Result := TDataSetField(CreateField(DataSet, ftDataSet, FieldName));
Result := TDataSetField(CreateField(DataSet, ftDataSet, RetFieldName(DataSet, FieldName)));
end;

class function TDataSetUtils.CreateField(DataSet: TDataSet;
Expand All @@ -33,7 +34,8 @@ class function TDataSetUtils.CreateField(DataSet: TDataSet;
end;

Result:= fieldClass.Create(DataSet);
Result.FieldName:= FieldName;
Result.FieldName:= RetFieldName(DataSet, FieldName);

if Result.FieldName = '' then
Result.FieldName:= 'Field' + IntToStr(DataSet.FieldCount +1);
Result.FieldKind := fkData;
Expand All @@ -47,4 +49,26 @@ class function TDataSetUtils.CreateField(DataSet: TDataSet;
raise Exception.CreateFmt('Size n�o definido para o campo "%s".',[FieldName]);
end;

class function TDataSetUtils.RetFieldName(DataSet: TDataSet; FieldName: string): string;

function RetAlfanum(str: string): string;
var
i: integer;
begin
Result := '';
for i:=1 to Length(str) do
begin
case str[i] of
'A'..'Z', 'a'..'z', '0'..'9', '_': Result := Result + str[i];
end;
end;
end;

begin
Result := RetAlfanum( FieldName );

if Length(Result) > 31 then
Result := Copy(Result,1,28) + Format('%3.3d',[DataSet.FieldCount + 1])
end;

end.
50 changes: 33 additions & 17 deletions src/JsonToDataSetConverter.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

interface

uses DB, DBClient, SuperObject;
uses DB, DBClient, SuperObject, SysUtils;

type
TJsonToDataSetConverter = class
Expand Down Expand Up @@ -88,31 +88,47 @@ class procedure TJsonToDataSetConverter.ExtractFields(ADataSet: TDataSet;AObject
vIterator: TSuperObjectIter;
vNestedField: TDataSetField;
vArray: TSuperArray;
bIgnoraCampo: boolean;
Valor: string;
begin
if SuperObject.ObjectFindFirst(AObject, vIterator) then
begin
try
repeat
if (vIterator.val.IsType(stArray)) then
begin
vNestedField := TDataSetUtils.CreateDataSetField(ADataSet, vIterator.key);
bIgnoraCampo := False;
Valor := Trim(vIterator.val.AsString);

vArray := vIterator.val.AsArray;
if (vArray.Length > 0) then
begin
ExtractFields(vNestedField.NestedDataSet, vArray[0]);
end;
end
else if (vIterator.val.IsType(stObject)) then
if ( Copy( Valor, 1, 1 ) = '[' ) and ( Copy( Valor, 2, 1 ) <> '{' ) then
begin
vNestedField := TDataSetUtils.CreateDataSetField(ADataSet, vIterator.key);
Valor := StringReplace( StringReplace( StringReplace( Valor, #13, '', [ rfReplaceAll ] ), #10, '', [ rfReplaceAll ] ), ' ', '', [ rfReplaceAll ] );

ExtractFields(vNestedField.NestedDataSet, vIterator.val);
end
else
begin
TDataSetUtils.CreateField(ADataSet, SuperTypeToFieldType(vIterator.val.DataType), vIterator.key, SuperTypeToFieldSize(vIterator.val.DataType));
if ( Copy( Valor, 2, 1 ) <> '{' ) then
bIgnoraCampo := True;
end;

if not bIgnoraCampo then
begin
if (vIterator.val.IsType(stArray)) then
begin
vNestedField := TDataSetUtils.CreateDataSetField(ADataSet, vIterator.key);

vArray := vIterator.val.AsArray;
if (vArray.Length > 0) then
begin
ExtractFields(vNestedField.NestedDataSet, vArray[0]);
end;
end
else if (vIterator.val.IsType(stObject)) then
begin
vNestedField := TDataSetUtils.CreateDataSetField(ADataSet, vIterator.key);

ExtractFields(vNestedField.NestedDataSet, vIterator.val);
end
else
begin
TDataSetUtils.CreateField(ADataSet, SuperTypeToFieldType(vIterator.val.DataType), vIterator.key, SuperTypeToFieldSize(vIterator.val.DataType));
end;
end;
until not SuperObject.ObjectFindNext(vIterator);
finally
SuperObject.ObjectFindClose(vIterator);
Expand Down