diff --git a/ideexpert/DMVC.Expert.CodeGen.Commands.pas b/ideexpert/DMVC.Expert.CodeGen.Commands.pas
index bed25621..ce251dac 100644
--- a/ideexpert/DMVC.Expert.CodeGen.Commands.pas
+++ b/ideexpert/DMVC.Expert.CodeGen.Commands.pas
@@ -904,7 +904,7 @@ procedure TUnitMainBeginEndCommand.ExecuteImplementation(Section: TStringBuilder
.AppendLine(' WebRequestHandlerProc.MaxConnections := dotEnv.Env(''dmvc.handler.max_connections'', 1024);')
.AppendLine
.AppendLine('{$IF CompilerVersion >= 34} //SYDNEY+')
- .AppendLine(' if dotEnv.Env(''dmvc.profiler.enabled'', false) then')
+ .AppendLine(' if dotEnv.Env(''dmvc.profiler.enabled'', ' + Model.S[TConfigKey.controller_actions_profiling_generate].ToLower + ') then')
.AppendLine(' begin')
.AppendLine(' Profiler.ProfileLogger := Log;')
.AppendLine(' Profiler.WarningThreshold := dotEnv.Env(''dmvc.profiler.warning_threshold'', 2000);')
@@ -941,7 +941,7 @@ procedure TUnitRunServerProcBody.ExecuteImplementation(Section: TStringBuilder;
.AppendLine(' try')
.AppendLine(' LServer.OnParseAuthentication := TMVCParseAuthentication.OnParseAuthentication;')
.AppendLine(' LServer.DefaultPort := APort;')
- .AppendLine(' LServer.KeepAlive := True;')
+ .AppendLine(' LServer.KeepAlive := dotEnv.Env(''dmvc.indy.keep_alive'', True);')
.AppendLine(' LServer.MaxConnections := dotEnv.Env(''dmvc.webbroker.max_connections'', 0);')
.AppendLine(' LServer.ListenQueue := dotEnv.Env(''dmvc.indy.listen_queue'', 500);')
.AppendLine(' LServer.Active := True;')
diff --git a/ideexpert/DMVC.Expert.Forms.NewProjectWizard.dfm b/ideexpert/DMVC.Expert.Forms.NewProjectWizard.dfm
index d3797b49..03704bca 100644
--- a/ideexpert/DMVC.Expert.Forms.NewProjectWizard.dfm
+++ b/ideexpert/DMVC.Expert.Forms.NewProjectWizard.dfm
@@ -591,7 +591,7 @@ object frmDMVCNewProject: TfrmDMVCNewProject
Width = 276
Height = 26
Anchors = [akLeft, akTop, akRight]
- Caption = 'Profiling Code (must be enabled system-wide in dpr)'
+ Caption = 'Actions Profiling'
TabOrder = 4
WordWrap = True
end
diff --git a/samples/activerecord_restful_crud/OtherControllerU.pas b/samples/activerecord_restful_crud/OtherControllerU.pas
index 401e05ae..16b3356f 100644
--- a/samples/activerecord_restful_crud/OtherControllerU.pas
+++ b/samples/activerecord_restful_crud/OtherControllerU.pas
@@ -10,24 +10,24 @@ TOtherController = class(TMVCController)
public
[MVCPath]
[MVCHTTPMethods([httpGET])]
- procedure GetSomethings;
+ function GetSomethings: String;
[MVCPath('/else')]
[MVCHTTPMethods([httpGET])]
- procedure GetSomethingElse;
+ function GetSomethingElse: String;
end;
implementation
{ TCustomController }
-procedure TOtherController.GetSomethingElse;
+function TOtherController.GetSomethingElse: String;
begin
- Render('Hello There, it''s "GetSomethingElse" here');
+ Result := 'Hello There, it''s "GetSomethingElse" here';
end;
-procedure TOtherController.GetSomethings;
+function TOtherController.GetSomethings: String;
begin
- Render('Hello There, it''s "GetSomethings" here');
+ Result := 'Hello There, it''s "GetSomethings" here';
end;
end.
diff --git a/samples/activerecord_restful_crud/activerecord_restful_crud.dproj b/samples/activerecord_restful_crud/activerecord_restful_crud.dproj
index 063ce12d..863ba955 100644
--- a/samples/activerecord_restful_crud/activerecord_restful_crud.dproj
+++ b/samples/activerecord_restful_crud/activerecord_restful_crud.dproj
@@ -4,11 +4,12 @@
activerecord_restful_crud.dpr
True
Debug
- 32897
+ 32769
Console
None
20.1
Win32
+ activerecord_restful_crud
true
@@ -149,12 +150,9 @@
TWebModule
-
-
-
Base
@@ -179,7 +177,6 @@
False
True
- True
True
False
@@ -200,6 +197,12 @@
+
+
+ activerecord_restful_crud.exe
+ true
+
+
1
@@ -793,6 +796,9 @@
1
+
+ 1
+
@@ -1054,6 +1060,7 @@
+
12
diff --git a/samples/articles_crud_server/articles_crud_server.dproj b/samples/articles_crud_server/articles_crud_server.dproj
index 7aebc370..2c176fb3 100644
--- a/samples/articles_crud_server/articles_crud_server.dproj
+++ b/samples/articles_crud_server/articles_crud_server.dproj
@@ -99,8 +99,6 @@
-
-
Base
diff --git a/sources/MVCFramework.ActiveRecordController.pas b/sources/MVCFramework.ActiveRecordController.pas
index 2b953d1d..dfeab3b2 100644
--- a/sources/MVCFramework.ActiveRecordController.pas
+++ b/sources/MVCFramework.ActiveRecordController.pas
@@ -112,8 +112,6 @@ procedure TMVCActiveRecordController.GetEntities(const entityname: string);
lRQL: string;
lInstance: TMVCActiveRecord;
lMapping: TMVCFieldsMapping;
- lConnection: TFDConnection;
- lRQLBackend: string;
lProcessor: IMVCEntityProcessor;
lHandled: Boolean;
lARResp: TMVCActiveRecordList;
@@ -142,12 +140,6 @@ procedure TMVCActiveRecordController.GetEntities(const entityname: string);
lRQL := Context.Request.QueryStringParam('rql');
try
- // if lRQL.IsEmpty then
- // begin
- // lRQL := Format('limit(0,%d)', [GetMaxRecordCount]);
- // end;
- lConnection := ActiveRecordConnectionsRegistry.GetCurrent;
- lRQLBackend := GetBackEndByConnection(lConnection);
LogD('[RQL PARSE]: ' + lRQL);
lInstance := lARClassRef.Create(True);
try