Improved type recognition in SetPKValue for TMVCActiveRecord

danieleteti · Dec 18, 2024 · cb97325 · cb97325
1 parent d8204c9
commit cb97325
Showing 1 changed file with 48 additions and 8 deletions.
diff --git a/sources/MVCFramework.ActiveRecord.pas b/sources/MVCFramework.ActiveRecord.pas
@@ -3389,15 +3389,35 @@ procedure TMVCActiveRecord.SetPK(const aValue: TValue);
         raise EMVCActiveRecord.Create('Invalid type for primary key');
       end;
     end
-    else if lPKValue.IsType<NullableInt64> and aValue.IsType<NullableInt64>() then
+    else if lPKValue.IsType<NullableInt64> then
     begin
-      if aValue.AsType<NullableInt64>().HasValue then
+      if aValue.IsType<NullableInt64>() then
       begin
-        lPKValue := aValue;
+        if aValue.AsType<NullableInt64>().HasValue then
+        begin
+          lPKValue := aValue;
+        end
+        else
+        begin
+          lPKValue.AsType<NullableInt64>().Clear;
+        end;
+      end
+      else if aValue.TypeInfo = TypeInfo(Integer) then
+      begin
+        lPKValue := TValue.From<NullableInt64>(aValue.AsInteger);
+      end
+      else if aValue.TypeInfo = TypeInfo(Int64) then
+      begin
+        lPKValue := TValue.From<NullableInt64>(aValue.AsInt64);
+      end
+      else if aValue.TypeInfo = TypeInfo(UInt64) then
+      begin
+        lPKValue := TValue.From<NullableInt64>(aValue.AsUInt64);
       end
       else
       begin
-        lPKValue.AsType<NullableInt64>().Clear;
+        raise EMVCActiveRecord.CreateFmt(
+          'Invalid type for %s primary key [HINT] Double check if TypeInfo(PK) is equal to TypeInfo(Value)', [lPKValue.TypeInfo.Name]);
       end;
     end
     else if lPKValue.IsType<NullableString> and aValue.IsType<NullableString>() then
@@ -3422,15 +3442,35 @@ procedure TMVCActiveRecord.SetPK(const aValue: TValue);
         lPKValue.AsType<NullableUInt32>().Clear;
       end;
     end
-    else if lPKValue.IsType<NullableUInt64> and aValue.IsType<NullableUInt64>() then
+    else if lPKValue.IsType<NullableUInt64> then
     begin
-      if aValue.AsType<NullableUInt64>().HasValue then
+      if aValue.IsType<NullableUInt64>() then
       begin
-        lPKValue := aValue;
+        if aValue.AsType<NullableUInt64>().HasValue then
+        begin
+          lPKValue := aValue;
+        end
+        else
+        begin
+          lPKValue.AsType<NullableUInt64>().Clear;
+        end
+      end
+      else if aValue.TypeInfo = TypeInfo(Integer) then
+      begin
+        lPKValue := TValue.From<NullableUInt64>(aValue.AsInteger);
+      end
+      else if aValue.TypeInfo = TypeInfo(Int64) then
+      begin
+        lPKValue := TValue.From<NullableUInt64>(aValue.AsInt64);
+      end
+      else if aValue.TypeInfo = TypeInfo(UInt64) then
+      begin
+        lPKValue := TValue.From<NullableUInt64>(aValue.AsUInt64);
       end
       else
       begin
-        lPKValue.AsType<NullableUInt64>().Clear;
+        raise EMVCActiveRecord.CreateFmt(
+          'Invalid type for %s primary key [HINT] Double check if TypeInfo(PK) is equal to TypeInfo(Value)', [lPKValue.TypeInfo.Name]);
       end;
     end
     else