dump to 3.4.2-magnesium

danieleteti · Feb 13, 2025 · d315876 · d315876
1 parent 8f3bbdc
commit d315876
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/samples/custom_auth/MyWebModuleU.dfm b/samples/custom_auth/MyWebModuleU.dfm
@@ -1,5 +1,4 @@
 object MyWebModule: TMyWebModule
-  OldCreateOrder = False
   OnCreate = WebModuleCreate
   OnDestroy = WebModuleDestroy
   Actions = <>

diff --git a/samples/custom_auth/MyWebModuleU.pas b/samples/custom_auth/MyWebModuleU.pas
@@ -62,8 +62,6 @@ procedure TMyWebModule.WebModuleCreate(Sender: TObject);
   FMVC := TMVCEngine.Create(Self,
     procedure(Config: TMVCConfig)
     begin
-      // session timeout (0 means session cookie)
-      Config[TMVCConfigKey.SessionTimeout] := '0';
       // default content-type
       Config[TMVCConfigKey.DefaultContentType] := TMVCConstants.DEFAULT_CONTENT_TYPE;
       // default content charset

diff --git a/sources/dmvcframeworkbuildconsts.inc b/sources/dmvcframeworkbuildconsts.inc
@@ -1,2 +1,2 @@
 const
-  DMVCFRAMEWORK_VERSION = '3.4.2-magnesium-rc5';
+  DMVCFRAMEWORK_VERSION = '3.4.2-magnesium';
diff --git a/unittests/general/Several/ActiveRecordTestsU.pas b/unittests/general/Several/ActiveRecordTestsU.pas
@@ -752,32 +752,34 @@ procedure TTestActiveRecordBase.TestLifeCycle;
     lCustomer.Insert;
     Assert.AreEqual
       ('OnValidation|OnBeforeInsert|OnBeforeInsertOrUpdate|OnBeforeExecuteSQL|MapObjectToParams|OnAfterInsert|OnAfterInsertOrUpdate',
-      lCustomer.GetHistory);
+      lCustomer.GetHistory, 'step1');
     lID := lCustomer.ID;
   finally
     lCustomer.Free;
   end;
 
   lCustomer := TMVCActiveRecord.GetByPK<TCustomerWithLF>(lID);
   try
-    Assert.AreEqual('OnBeforeLoad|MapDatasetToObject|OnAfterLoad', lCustomer.GetHistory);
+    Assert.AreEqual('OnBeforeExecuteSQL|OnBeforeLoad|MapDatasetToObject|OnAfterLoad',
+      lCustomer.GetHistory, 'step2');
     lCustomer.ClearHistory;
     lCustomer.City := 'XXX';
     lCustomer.Update;
     Assert.AreEqual
       ('OnValidation|OnBeforeUpdate|OnBeforeInsertOrUpdate|OnBeforeExecuteSQL|MapObjectToParams|OnAfterUpdate|OnAfterInsertOrUpdate',
-      lCustomer.GetHistory);
+      lCustomer.GetHistory, 'step3');
   finally
     lCustomer.Free;
   end;
 
   lCustomer := TMVCActiveRecord.GetOneByWhere<TCustomerWithLF>('id = ?', [lID]);
   try
-    Assert.AreEqual('OnBeforeLoad|MapDatasetToObject|OnAfterLoad', lCustomer.GetHistory);
+    Assert.AreEqual('OnBeforeLoad|MapDatasetToObject|OnAfterLoad',
+      lCustomer.GetHistory, 'step4');
     lCustomer.ClearHistory;
     lCustomer.Delete;
     Assert.AreEqual('OnValidation|OnBeforeDelete|OnBeforeExecuteSQL|MapObjectToParams|OnAfterDelete',
-      lCustomer.GetHistory);
+      lCustomer.GetHistory, 'step5');
   finally
     lCustomer.Free;
   end;