Added support for middelware sessions in wizard.

danieleteti · Jan 27, 2025 · 381a08b · 381a08b
1 parent bf213b3
commit 381a08b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/ideexpert/DMVC.Expert.CodeGen.Commands.pas b/ideexpert/DMVC.Expert.CodeGen.Commands.pas
@@ -913,7 +913,13 @@ procedure TUnitWebModuleDeclarationCommand.ExecuteImplementation(
       .AppendLine('  // fMVC.AddMiddleware(UseMemorySessionMiddleware);')
       .AppendLine('  //')
       .AppendLine('  // To use file based session uncomment the following line')
-      .AppendLine('  // fMVC.AddMiddleware(UseFileSessionMiddleware);');
+      .AppendLine('  // fMVC.AddMiddleware(UseFileSessionMiddleware);')
+      .AppendLine('  //')
+      .AppendLine('  // To use database based session uncomment the following lines,')
+  	  .AppendLine('  // configure you firedac db connection and create table dmvc_sessions')
+  	  .AppendLine('  // fMVC.AddMiddleware(TMVCActiveRecordMiddleware.Create(''firedac_con_def_name''));')
+  	  .AppendLine('  // fMVC.AddMiddleware(UseDatabaseSessionMiddleware);');
+
 
     if Model.B[TConfigKey.webmodule_middleware_analytics] then
     begin

diff --git a/samples/activerecord_showcase/MainFormU.dfm b/samples/activerecord_showcase/MainFormU.dfm
@@ -55,7 +55,6 @@ object MainForm: TMainForm
     TabOrder = 2
     WantReturns = False
     WordWrap = False
-    ExplicitHeight = 644
   end
   object btnRelations: TButton
     Left = 8

diff --git a/samples/activerecord_showcase/MainFormU.pas b/samples/activerecord_showcase/MainFormU.pas
@@ -28,8 +28,8 @@ interface
   MVCFramework.Nullables,
   MVCFramework.ActiveRecord,
   MVCFramework.Logger,
-
-  System.Generics.Collections, System.Diagnostics;
+  System.Generics.Collections,
+  System.Diagnostics;
 
 type
   TMainForm = class(TForm)

diff --git a/samples/htmx_website_with_templatepro/HelpersU.pas b/samples/htmx_website_with_templatepro/HelpersU.pas
@@ -3,7 +3,7 @@
 interface
 
 uses
-  System.Rtti;
+  System.Rtti, TemplatePro;
 
 function MyHelper1(const Value: TValue; const Parameters: TArray<TFilterParameter>): TValue;
 function MyHelper2(const Value: TValue; const Parameters: TArray<TFilterParameter>): TValue;
@@ -14,7 +14,7 @@ procedure TemplateProContextConfigure;
 implementation
 
 uses
-  TemplatePro, System.SysUtils;
+  System.SysUtils;
 
 
 function MyHelper1(const Value: TValue; const Parameters: TArray<TFilterParameter>): TValue;

diff --git a/sources/MVCFramework.ActiveRecord.pas b/sources/MVCFramework.ActiveRecord.pas
@@ -2853,13 +2853,14 @@ procedure TMVCActiveRecord.LoadByDataset(const aDataSet: TDataSet; const aOption
 
 function TMVCActiveRecord.LoadByPK(const id: string; const aFieldType: TFieldType): Boolean;
 var
-  SQL: string;
+  lSQL: string;
   lDataSet: TDataSet;
 begin
   CheckAction(TMVCEntityAction.eaRetrieve);
-  SQL := SQLGenerator.CreateSelectByPKSQL(TableName, fTableMap.fMap,
+  lSQL := SQLGenerator.CreateSelectByPKSQL(TableName, fTableMap.fMap,
     fTableMap.fPrimaryKeyFieldName, fTableMap.fPrimaryKeyOptions);
-  lDataSet := ExecQuery(SQL, [id], [aFieldType], GetConnection, True, False);
+  OnBeforeExecuteSQL(lSQL);
+  lDataSet := ExecQuery(lSQL, [id], [aFieldType], GetConnection, True, False);
   try
     Result := not lDataSet.Eof;
     if Result then

diff --git a/sources/MVCFramework.pas b/sources/MVCFramework.pas
@@ -2836,18 +2836,7 @@ function TMVCEngine.ExecuteAction(const ASender: TObject; const ARequest: TWebRe
                   lSelectedController.MVCControllerAfterCreate;
                   try
                     lHandled := False;
-//                    if not ARequest.Accept.IsEmpty and (ARequest.Accept <> '*/*') then
-//                    begin
-//                      {if router allowed to reach this point, we try to adhere to
-//                       the client preferred media type, so the response content type
-//                       is by default the request accept header}
-//                      lSelectedController.ContentType := BuildContentType(ARequest.Accept, '')
-//                    end
-//                    else
-//                    begin
-//                      {if client didn't specify an accept media type, we use the default content type}
                     lSelectedController.ContentType := BuildContentType(lResponseContentMediaType, lResponseContentCharset);
-//                    end;
                     lActionFormalParams := lRouter.MethodToCall.GetParameters;
                     if (Length(lActionFormalParams) = 0) then
                       SetLength(lActualParams, 0)
@@ -3026,10 +3015,10 @@ function TMVCEngine.ExecuteAction(const ASender: TObject; const ARequest: TWebRe
                     HTTP_STATUS.ReasonStringFor(E.HTTPStatusCode),
                     E.DetailedMessage
                   ], LOGGERPRO_TAG);
-                if lContext.SessionStarted then
-                begin
-                  lContext.SessionStop;
-                end;
+//                if lContext.SessionStarted then
+//                begin
+//                  lContext.SessionStop;
+//                end;
                 if Assigned(lSelectedController) then
                 begin
                   lSelectedController.ResponseStatus(E.HTTPStatusCode);