minor code refactoring

synopse · Feb 7, 2022 · ef60583 · ef60583
1 parent 9a95932
commit ef60583
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/orm/mormot.orm.core.pas b/src/orm/mormot.orm.core.pas
@@ -9185,9 +9185,8 @@ constructor TOrmProperties.Create(aTable: TOrmClass);
   begin
     fRecordManySourceProp := Fields.ByRawUtf8Name('Source') as TOrmPropInfoRttiInstance;
     if fRecordManySourceProp = nil then
-      raise EModelException.CreateUtf8('% expects a SOURCE field', [Table])
-    else
-      fRecordManyDestProp := Fields.ByRawUtf8Name('Dest') as TOrmPropInfoRttiInstance;
+      raise EModelException.CreateUtf8('% expects a SOURCE field', [Table]);
+    fRecordManyDestProp := Fields.ByRawUtf8Name('Dest') as TOrmPropInfoRttiInstance;
     if fRecordManyDestProp = nil then
       raise EModelException.CreateUtf8('% expects a DEST field', [Table]);
   end;

diff --git a/src/orm/mormot.orm.storage.pas b/src/orm/mormot.orm.storage.pas
@@ -3113,7 +3113,7 @@ procedure TRestStorageInMemory.ComputeStateAfterLoad(
     'Json', 'Binary');
 var
   f: PtrInt;
-  dup: integer;
+  dup: integer; // should be an integer and not a PtrInt for ForceRehash(@dup)
   dupfield: RawUtf8;
   timer: TPrecisionTimer;
 begin

diff --git a/src/soa/mormot.soa.codegen.pas b/src/soa/mormot.soa.codegen.pas
@@ -1226,7 +1226,7 @@ function TWrapperContext.Context: variant;
     'time',          NowToString,
     'year',          CurrentYear,
     'mORMotVersion', SYNOPSE_FRAMEWORK_VERSION,
-    'Executable', VarStringOrNull(StringToUtf8(Executable.Version.DetailedOrVoid)),
+    'Executable',    VarStringOrNull(StringToUtf8(Executable.Version.DetailedOrVoid)),
     'exeInfo',       Executable.Version.VersionInfo,
     'exeName',       Executable.ProgramName,
     'hasorm',        fORM.Count > 0,