feat: run user startup script in DoAfterConnect call, which includes reconnects

Refs #1896

Author: ansgarbecker

source/dbconnection.pas

@@ -3375,6 +3375,9 @@ procedure TDBConnection.DoAfterConnect;
 var
   SQLFunctionsFileOrder: String;
   MajorMinorVer, MajorVer: String;
+  StartupScript: String;
+  StartupBatch: TSQLBatch;
+  SqlQuery: TSQLSentence;
 begin
   FSqlProvider.ServerVersion := ServerVersionInt;
   AppSettings.SessionPath := FParameters.SessionPath;
@@ -3408,6 +3411,24 @@ procedure TDBConnection.DoAfterConnect;
   else
     SQLFunctionsFileOrder := '';
   FSQLFunctions := TSQLFunctionList.Create(Self, SQLFunctionsFileOrder);
+
+  // Process startup script
+  StartupScript := Trim(FParameters.StartupScriptFilename);
+  if StartupScript <> '' then begin
+    StartupScript := ExpandFileName(StartupScript);
+    if not FileExists(StartupScript) then
+      Log(lcError, f_('Startup script file not found: %s', [StartupScript]))
+    else begin
+      StartupBatch := TSQLBatch.Create(FParameters.NetTypeGroup);
+      StartupBatch.SQL := ReadTextfile(StartupScript, nil);
+      for SqlQuery in StartupBatch do try
+        Query(SqlQuery.SQL);
+      except
+        // Suppress popup, errors get logged into SQL log
+      end;
+      StartupBatch.Free;
+    end;
+  end;
 end;
 
 

source/main.pas

@@ -4336,9 +4336,7 @@ procedure TMainForm.SessionConnect(Sender: TObject);
 function TMainform.InitConnection(Params: TConnectionParameters; ActivateMe: Boolean; var Connection: TDBConnection): Boolean;
 var
   RestoreLastActiveDatabase: Boolean;
-  StartupScript, LastActiveDatabase: String;
-  StartupBatch: TSQLBatch;
-  Query: TSQLSentence;
+  LastActiveDatabase: String;
   SessionNode, DBNode: PVirtualNode;
 begin
   Connection := Params.CreateConnection(Self);
@@ -4381,24 +4379,6 @@ function TMainform.InitConnection(Params: TConnectionParameters; ActivateMe: Boo
       end;
     end;
 
-    // Process startup script
-    StartupScript := Trim(Connection.Parameters.StartupScriptFilename);
-    if StartupScript <> '' then begin
-      StartupScript := ExpandFileName(StartupScript);
-      if not FileExists(StartupScript) then
-        ErrorDialog(f_('Startup script file not found: %s', [StartupScript]))
-      else begin
-        StartupBatch := TSQLBatch.Create(Connection.Parameters.NetTypeGroup);
-        StartupBatch.SQL := ReadTextfile(StartupScript, nil);
-        for Query in StartupBatch do try
-          Connection.Query(Query.SQL);
-        except
-          // Suppress popup, errors get logged into SQL log
-        end;
-        StartupBatch.Free;
-      end;
-    end;
-
     if Params.WantSSL and not Connection.IsSSL then begin
       MessageDialog(_('SSL not used.'),
         _('Your SSL settings were not accepted by the server, or the server does not support any SSL configuration.'),