Fix - Bug

arbsis · Jun 27, 2024 · dc5f605 · dc5f605
1 parent eb3ae9d
commit dc5f605
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Examples/delphi/model.person.pas b/Examples/delphi/model.person.pas
@@ -7,6 +7,7 @@ interface
   DB,
   Generics.Collections,
   /// orm
+  ormbr.types.nullable,
   dbcbr.types.mapping,
   dbcbr.mapping.attributes,
   dbcbr.mapping.register;
@@ -42,7 +43,7 @@   TPerson = class
     FLastName: String;
     FAge: Integer;
     FSalary: Double;
-    FDate: TDateTime;
+    FDate: Nullable<TDateTime>;
     FPessoa: TPersonSub;
     FPessoas: TObjectList<TPersonSub>;
     FBlob: String;
@@ -78,7 +79,7 @@   TPerson = class
     [Restrictions([NotNull])]
     [Column('Date', ftDateTime)]
     [Dictionary('Nivel','Data de aniversário','Date','','',taRightJustify)]
-    property Date: TDateTime read FDate write FDate;
+    property Date: Nullable<TDateTime> read FDate write FDate;
 
     [Column('Imagem', ftBlob)]
     property Imagem: String read FBlob write FBlob;

diff --git a/Source/Core/jsonbr.utils.pas b/Source/Core/jsonbr.utils.pas
@@ -25,15 +25,15 @@ function DateTimeToIso8601(const AValue: TDateTime;
 begin
   Result := '';
   if AValue = 0 then
-    exit;
+    Exit;
 
   if AUseISO8601DateFormat then
     LDatePart := FormatDateTime('yyyy-mm-dd', AValue)
   else
     LDatePart := DateToStr(AValue, GJsonBrFormatSettings);
 
   if Frac(AValue) = 0 then
-    Result := ifThen(AUseISO8601DateFormat, LDatePart, TimeToStr(AValue, GJsonBrFormatSettings))
+    Result := ifThen(AUseISO8601DateFormat, LDatePart, DateToStr(AValue, GJsonBrFormatSettings))
   else
   begin
     LTimePart := FormatDateTime('hh:nn:ss', AValue);
@@ -55,7 +55,7 @@ function Iso8601ToDateTime(const AValue: String;
   if not AUseISO8601DateFormat then
   begin
     Result := StrToDateTimeDef(AValue, 0);
-    exit;
+    Exit;
   end;
   LYYYY := 0; LMM := 0; LDD := 0; LHH := 0; LMI := 0; LSS := 0; LMS := 0;
   if TryStrToInt(Copy(AValue, 1, 4), LYYYY) and

diff --git a/Source/jsonbr.pas b/Source/jsonbr.pas
@@ -174,7 +174,7 @@ class function TJsonBr.ObjectListToJsonString(AObjectList: TObjectList<TObject>;
 class function TJsonBr.ObjectListToJsonString<T>(AObjectList: TObjectList<T>;
   AStoreClassName: Boolean): String;
 var
-  LFor: integer;
+  LFor: Integer;
   LResultBuilder: TStringBuilder;
 begin
   LResultBuilder := TStringBuilder.Create;