https://github.com/danieleteti/delphimvcframework/issues/581

Author: danieleteti

sources/MVCFramework.ActiveRecord.pas

@@ -541,9 +541,10 @@   TMVCEntitiesRegistry = class(TInterfacedObject, IMVCEntitiesRegistry)
 
   IMVCActiveRecordConnections = interface
     ['{7B87473C-1784-489F-A838-925E7DDD0DE2}']
-    procedure AddConnection(const aName: string; const aConnection: TFDConnection; const Owns: Boolean = false);
+    procedure AddConnection(const aName: string; const aConnection: TFDConnection; const Owns: Boolean = false); overload;
     procedure AddDefaultConnection(const aConnection: TFDConnection; const Owns: Boolean = false); overload;
     procedure AddDefaultConnection(const aConnectionDefName: String); overload;
+    procedure AddConnection(const aName, aConnectionDefName: String); overload;
     procedure RemoveConnection(const aName: string; const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure RemoveDefaultConnection(const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure SetCurrent(const aName: string);
@@ -569,7 +570,8 @@     TConnHolder = class
   public
     constructor Create; virtual;
     destructor Destroy; override;
-    procedure AddConnection(const aName: string; const aConnection: TFDConnection; const aOwns: Boolean = false);
+    procedure AddConnection(const aName: string; const aConnection: TFDConnection; const aOwns: Boolean = false); overload;
+    procedure AddConnection(const aName, aConnectionDefName: String); overload;
     procedure AddDefaultConnection(const aConnection: TFDConnection; const aOwns: Boolean = false); overload;
     procedure AddDefaultConnection(const aConnectionDefName: String); overload;
     procedure RemoveConnection(const aName: string; const RaiseExceptionIfNotAvailable: Boolean = True);
@@ -883,14 +885,15 @@ procedure TMVCConnectionsRepository.AddDefaultConnection(const aConnection: TFDC
   AddConnection('default', aConnection, aOwns);
 end;
 
-procedure TMVCConnectionsRepository.AddDefaultConnection(const aConnectionDefName: String);
+procedure TMVCConnectionsRepository.AddConnection(const aName,
+  aConnectionDefName: String);
 var
   lConn: TFDConnection;
 begin
   lConn := TFDConnection.Create(nil);
   try
     lConn.ConnectionDefName := aConnectionDefName;
-    AddDefaultConnection(lConn, True);
+    AddConnection(aName, lConn, True);
   except
     on E: Exception do
     begin
@@ -900,6 +903,11 @@ procedure TMVCConnectionsRepository.AddDefaultConnection(const aConnectionDefNam
   end;
 end;
 
+procedure TMVCConnectionsRepository.AddDefaultConnection(const aConnectionDefName: String);
+begin
+  AddConnection('default', aConnectionDefName);
+end;
+
 constructor TMVCConnectionsRepository.Create;
 begin
   inherited;

sources/MVCFramework.Middleware.ActiveRecord.pas

@@ -40,9 +40,13 @@ interface
 
   TMVCActiveRecordMiddleware = class(TInterfacedObject, IMVCMiddleware)
   private
-    fConnectionDefName: string;
+    fDefaultConnectionDefName: string;
     fConnectionDefFileName: string;
     fConnectionLoaded: Boolean;
+    fAdditionalARConnectionNames: TArray<String>;
+    fAdditionalConnectionDefNames: TArray<String>;
+    fAdditionalARConnectionNamesCount: Integer;
+    fAdditionalConnectionDefNamesCount: Integer;
   protected
     procedure EnsureConnection;
     procedure OnBeforeRouting(
@@ -68,8 +72,13 @@   TMVCActiveRecordMiddleware = class(TInterfacedObject, IMVCMiddleware)
       const AHandled: Boolean);
   public
     constructor Create(
-      const ConnectionDefName: string;
-      const ConnectionDefFileName: string = 'FDConnectionDefs.ini'); virtual;
+      const DefaultConnectionDefName: string;
+      const ConnectionDefFileName: string{ = 'FDConnectionDefs.ini'}); overload; virtual;
+    constructor Create(
+      const DefaultConnectionDefName: string;
+      const AdditionalARConnectionNames: TArray<String>;
+      const AdditionalConnectionDefNames: TArray<String>;
+      const ConnectionDefFileName: string{ = 'FDConnectionDefs.ini'}); overload; virtual;
   end;
 
 implementation
@@ -84,16 +93,30 @@ implementation
 
 { TMVCActiveRecordMiddleware }
 
-constructor TMVCActiveRecordMiddleware.Create(const ConnectionDefName: string;
+constructor TMVCActiveRecordMiddleware.Create(const DefaultConnectionDefName: string;
   const ConnectionDefFileName: string);
 begin
   inherited Create;
   fConnectionLoaded := False;
-  fConnectionDefName := ConnectionDefName;
+  fDefaultConnectionDefName := DefaultConnectionDefName;
+  fConnectionDefFileName := ConnectionDefFileName;
+end;
+
+constructor TMVCActiveRecordMiddleware.Create(
+  const DefaultConnectionDefName: string;
+  const AdditionalARConnectionNames, AdditionalConnectionDefNames: TArray<String>;
+  const ConnectionDefFileName: string);
+begin
+  fConnectionLoaded := False;
+  fDefaultConnectionDefName := DefaultConnectionDefName;
   fConnectionDefFileName := ConnectionDefFileName;
+  fAdditionalARConnectionNames := AdditionalARConnectionNames;
+  fAdditionalConnectionDefNames := AdditionalConnectionDefNames;
 end;
 
 procedure TMVCActiveRecordMiddleware.EnsureConnection;
+var
+  I: Integer;
 begin
   if fConnectionLoaded then
   begin
@@ -116,10 +139,34 @@ procedure TMVCActiveRecordMiddleware.EnsureConnection;
         begin
           FDManager.LoadConnectionDefFile;
         end;
-        if not FDManager.IsConnectionDef(fConnectionDefName) then
+      end;
+
+      //loading default connection
+      if not fDefaultConnectionDefName.IsEmpty then
+      begin
+        if not FDManager.IsConnectionDef(fDefaultConnectionDefName) then
+        begin
+          raise EMVCConfigException.CreateFmt('ConnectionDefName "%s" not found in config file "%s" - or config file not present',
+            [fDefaultConnectionDefName, FDManager.ActualConnectionDefFileName]);
+        end;
+      end;
+
+      //loading additional connections
+      fAdditionalARConnectionNamesCount := Length(fAdditionalARConnectionNames);
+      fAdditionalConnectionDefNamesCount := Length(fAdditionalConnectionDefNames);
+      if (fAdditionalARConnectionNamesCount > 0) or (fAdditionalConnectionDefNamesCount > 0) then
+      begin
+        if fAdditionalARConnectionNamesCount <> fAdditionalConnectionDefNamesCount then
+        begin
+          raise EMVCConfigException.Create('AdditionalARConnectionNames must have the same length of AdditionalConnectionDefNames');
+        end;
+        for I := 0 to fAdditionalConnectionDefNamesCount - 1 do
         begin
-          raise EMVCConfigException.CreateFmt('ConnectionDefName "%s" not found in config file "%s"',
-            [fConnectionDefName, FDManager.ActualConnectionDefFileName]);
+          if not FDManager.IsConnectionDef(fAdditionalConnectionDefNames[I]) then
+          begin
+            raise EMVCConfigException.CreateFmt('ConnectionDefName "%s" not found in config file "%s"',
+              [fAdditionalConnectionDefNames[I], FDManager.ActualConnectionDefFileName]);
+          end;
         end;
       end;
     end;
@@ -139,8 +186,17 @@ procedure TMVCActiveRecordMiddleware.OnAfterControllerAction(
 end;
 
 procedure TMVCActiveRecordMiddleware.OnAfterRouting(AContext: TWebContext; const AHandled: Boolean);
+var
+  I: Integer;
 begin
-  ActiveRecordConnectionsRegistry.RemoveDefaultConnection(False);
+  if not fDefaultConnectionDefName.IsEmpty then
+  begin
+    ActiveRecordConnectionsRegistry.RemoveDefaultConnection(False);
+  end;
+  for I := 0 to fAdditionalConnectionDefNamesCount - 1 do
+  begin
+    ActiveRecordConnectionsRegistry.RemoveConnection(fAdditionalARConnectionNames[I], False);
+  end;
 end;
 
 procedure TMVCActiveRecordMiddleware.OnBeforeControllerAction(
@@ -152,9 +208,18 @@ procedure TMVCActiveRecordMiddleware.OnBeforeControllerAction(
 end;
 
 procedure TMVCActiveRecordMiddleware.OnBeforeRouting(AContext: TWebContext; var AHandled: Boolean);
+var
+  I: Integer;
 begin
   EnsureConnection;
-  ActiveRecordConnectionsRegistry.AddDefaultConnection(fConnectionDefName);
+  if not fDefaultConnectionDefName.IsEmpty then
+  begin
+    ActiveRecordConnectionsRegistry.AddDefaultConnection(fDefaultConnectionDefName);
+  end;
+  for I := 0 to fAdditionalConnectionDefNamesCount - 1 do
+  begin
+    ActiveRecordConnectionsRegistry.AddConnection(fAdditionalARConnectionNames[I], fAdditionalConnectionDefNames[I]);
+  end;
   AHandled := False;
 end;