v1.31.1.0

Schwirg László
1 parent d4dde2c4
Showing 3 changed files with 159 additions and 118 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - ColorConsole.cs
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -16,6 +16,7 @@ using static Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS.FolderToClean.X
 using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
+using Microsoft.SqlServer.Management.SqlParser.Diagnostics;
 namespace Vrh.Log4Pro.MaintenanceConsole.ColorConsoleNS
 {
@@ -78,18 +79,33 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ColorConsoleNS
         {
             if (SilentMode) { return GetConsoleKey(ConsoleKey.Enter); }
             if (maxwaittime ==null || maxwaittime == TimeSpan.Zero) { return Console.ReadKey(); }
-			else 
-			{
-				var strtime = DateTime.Now;
-                var endtime = strtime.Add(maxwaittime.Value);
-				var nexttime = strtime;
-				while (nexttime <= endtime) 
-				{
-					if (Console.KeyAvailable) return Console.ReadKey(true);
-					Thread.Sleep(50);
-					nexttime = DateTime.Now;
-                }
-				return null;
+
+            var strtime = DateTime.Now;
+            var endtime = strtime.Add(maxwaittime.Value);
+
+            System.Timers.Timer t = new System.Timers.Timer();
+            t.Interval = 500;
+            t.AutoReset = true;
+            t.Elapsed += T_Elapsed;
+            t.Start();
+
+            var nexttime = strtime;
+            while (nexttime <= endtime)
+            {
+                if (Console.KeyAvailable) break;
+                Thread.Sleep(50);
+                nexttime = DateTime.Now;
+            }
+            t.Stop();
+            t.Dispose();
+            t = null;
+            return Console.KeyAvailable ? Console.ReadKey(true) : (ConsoleKeyInfo?)null;
+            void T_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+            {
+                var cursorposition_left = ColorConsole.CursorLeft;
+                var cursorposition_top = ColorConsole.CursorTop;
+                ColorConsole.Write($"{(int)(endtime.Subtract(DateTime.Now).TotalSeconds + 1)}", ConsoleColor.Yellow, prefix: "   >>> ", suffix: "    ");
+                ColorConsole.SetCursorPosition(cursorposition_left, cursorposition_top);
             }
         }
         public static ConsoleKeyInfo ReadKey()
@@ -995,7 +995,7 @@ GO
                         {
 							ColorConsole.Write(s.Key, ConsoleColor.Yellow, bracket: "[]",suffix:" ",prefix: "   ");
                             ColorConsole.Write(s.Name, ConsoleColor.Yellow, bracket: "[]", prefix: "Script:");
-                            if (s.Multirun) ColorConsole.Write("MULTIRUN", ConsoleColor.Red, bracket: "[]",prefix: " ");
+                            if (!string.IsNullOrWhiteSpace(s.MultirunParameters)) ColorConsole.Write("MULTIRUN", ConsoleColor.Red, bracket: "[]",prefix: " ");
 							ColorConsole.Write(s.Description, ConsoleColor.Yellow, prefix: " ");
                             if (!string.IsNullOrWhiteSpace(s.FilePath)) { ColorConsole.Write(s.FilePath, ConsoleColor.Yellow, prefix: ", from file:");
 							}
@@ -1012,15 +1012,15 @@ GO
 							var confirm = ColorConsole.ReadLine("Enter CONFIRM to start! [EX]=exit.", ConsoleColor.Yellow, prefix:"   ", suffix: " --> ", validitylist: new List<string>() {"CONFIRM"});
 							if (confirm == "CONFIRM")
 							{
-								bool multirunmode = ss.Multirun;
+								bool multirunmode = !string.IsNullOrWhiteSpace(ss.MultirunParameters);
 								int commandtimeout = ss.CommandTimeout;
 								ReturnInfoJSON result = null;
 								using (var sqlc = ServerConnectionPool.GetSqlConnection(sqld.SQLCS, open: true))
 								{
-									if (multirunmode) { result = SQLDataBaseManagerCore.ExecuteMultirunSQLScript(sqlc, ss, ExitAfterOneRun); }
+									if (multirunmode) { result = SQLDataBaseManagerCore.ExecuteMultirunSQLScript(sqlc, ss, ExitAtThisPoint); }
 									else
 									{
-										if (!Tools.KvpString.Resolve(ss.ArgumentParameters, ss.ScriptText, out string ssScriptText)) { return o; }
+										if (!Tools.KvpString.Resolve(ss.ScriptParameters, ss.ScriptText, out string ssScriptText)) { return o; }
 										ColorConsole.WriteLine(ssScriptText);
 										result = SQLDataBaseManagerCore.ExecuteSQLScript(sqlc, ssScriptText, commandtimeout, null);
 									}
@@ -1045,16 +1045,26 @@ GO
 			}
 			return o;
 		}
-        static bool ExitAfterOneRun(ReturnInfoJSON runresult) 
+        private static DateTime timerend;
+        static bool ExitAtThisPoint(ReturnInfoJSON runresult,TimeSpan? waittime=null) 
 		{
+			if (waittime == TimeSpan.Zero) waittime = null;
 			if (runresult != null) 
 			{
 				ColorConsole.Write(runresult.ReturnValue==0?"OK":"NOK", runresult.ReturnValue == 0 ? ConsoleColor.Green : ConsoleColor.Red);
 				ColorConsole.WriteLine(runresult.ReturnMessage, ConsoleColor.White,prefix:" ");
 			}
-			var returnkey = ColorConsole.ReadKey(new TimeSpan(0, 0, 5));
-			return returnkey != null; 
+			ConsoleKeyInfo? returnkey = null;
+			if (waittime != null) 
+			{
+                timerend = DateTime.Now.Add(waittime.Value);
+                ColorConsole.Write("Press any key to exit!", ConsoleColor.Yellow, prefix: "        ");
+                returnkey = ColorConsole.ReadKey(waittime);
+                ColorConsole.WriteLine();
+            }
+            return returnkey != null; 
 		}
+
         private static object DropDB(object parameter, object o)
 		{
 			var config = (parameter as Menu.ExecutorParameter).GetConfig<SQLDataBaseManagerXmlProcessor>();
@@ -1932,105 +1942,82 @@ GO
 		{
 			DBKEY,DATABASE,DATASOURCE,DBOTYPE,DBONAME,DBDATAGROUP,BACKUPTS,SHRINKOPTION,SHRINKFREESPACEPERCENT,
 		}
-        #endregion DBSubstitution
+		#endregion DBSubstitution
-        #region ExecuteSQLScriptWithMultipleRuns
-        /// <summary>
-        /// Executes a multirun script. Its parameters are in the <Script Parameters=> attribute, as list of KEY=VALUE; pairs.
-        /// Keys:
-        ///		DAYSBACK (C# int value) or LIMITDATE (C# DateTime value): how many days from now, or from when the older rows should be deleted
-        ///		NUMOFDAYSINONERUN (C# int value): how many days are deleted in one run 
-        ///		DELAYBETWEENRUNS (C# TimeSpan value): how much delay will be between runs 
-        ///		TESTMODE (C# bool value): if testmode, no delete takes place
-        /// </summary>
-        /// <param name="sqlc">connectionstring az sql server-hez</param>
-        /// <param name="sqlscript">az sql script (multirun interfész szerint!!!)
-        ///		this should be used in the script in the following way:
-        ///		DECLARE @RUNNINGMODE AS varchar(20) = '{RUNNINGMODE}'
-        ///		IF @RUNNINGMODE = 'GETTOTALRECORDS'
-        ///		THEN
-        ///			-- this part of the script should count the number of the rows of the dab, that will decrease after each run
-        ///			SELECT @RV, @RM -- @RV:0, @RM:the number of rows
-        ///		END
-        ///		ELSE IF @RUNNINGMODE = 'GETMINDATE'
-        ///		THEN
-        ///			-- this part of the script should return a DateTime value, that is the oldest date in the database
-        ///			SELECT @RV, @RM -- @RV:0, @RM:the Date, that is considered the oldest; no rows will be deleted before this
-        ///		END
-        ///		ELSE IF @RUNNINGMODE = 'ONERUN'
-        ///		THEN
-        ///			-- this part of the script deletes some rows from the database, older then a limitdate(parameter)
-        ///			-- parameter usage: DECLARE @RUNDELETEBEFOREDATE AS DATE = '{RUNDELETEBEFOREDATE}'
-        ///			SELECT @RV, @RM -- @RV:(0=OK, otherwise NOK), @RM:message with the result description
-        ///		END
-        /// </param>
-        /// <param name="ExitAfterOneRun">az a függvény, ami minde run után végrehajtásra kerül; 
-        ///		bemenő paramétere az előző run eredménye, 
-        ///		kimenő paramétere pedig igaz, ha ki kell lépni a végrehajtásból.
-        /// </param>
-        /// <returns></returns>
-        public static ReturnInfoJSON ExecuteMultirunSQLScript(SqlConnection sqlc, SQLDataBase.SQLScript sqlscript, Func<ReturnInfoJSON, bool> ExitAfterOneRun=null)
-        {
-            var multirunresult = new List<KeyValuePair<string, string>>();
-
-            var argkvplist = (new Tools.KvpString(sqlscript.ArgumentParameters)).ResolveInteractive();
-			if(argkvplist==null) { return Finalize(0, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE)); } //user exit with selecting EX
+		#region ExecuteSQLScriptWithMultipleRuns
+		/// <summary>
+		/// Executes a multirun script. Its parameters are in the <Script Parameters=> attribute, as list of KEY=VALUE; pairs.
+		/// Keys:
+		///		DAYSBACK (C# int value) or LIMITDATE (C# DateTime value): how many days from now, or from when the older rows should be deleted
+		///		NUMOFDAYSINONERUN (C# int value): how many days are deleted in one run 
+		///		DELAYBETWEENRUNS (C# TimeSpan value): how much delay will be between runs 
+		///		TESTMODE (C# bool value): if testmode, no delete takes place
+		/// </summary>
+		/// <param name="sqlc">connectionstring az sql server-hez</param>
+		/// <param name="sqlscript">az sql script (multirun interfész szerint!!!)
+		///		this should be used in the script in the following way:
+		///		DECLARE @RUNNINGMODE AS varchar(20) = '{RUNNINGMODE}'
+		///		IF @RUNNINGMODE = 'GETTOTALRECORDS'
+		///		THEN
+		///			-- this part of the script should count the number of the rows of the dab, that will decrease after each run
+		///			SELECT @RV, @RM -- @RV:0, @RM:the number of rows
+		///		END
+		///		ELSE IF @RUNNINGMODE = 'GETMINDATE'
+		///		THEN
+		///			-- this part of the script should return a DateTime value, that is the oldest date in the database
+		///			SELECT @RV, @RM -- @RV:0, @RM:the Date, that is considered the oldest; no rows will be deleted before this
+		///		END
+		///		ELSE IF @RUNNINGMODE = 'ONERUN'
+		///		THEN
+		///			-- this part of the script deletes some rows from the database, older then a limitdate(parameter)
+		///			-- parameter usage: DECLARE @RUNDELETEBEFOREDATE AS DATE = '{RUNDELETEBEFOREDATE}'
+		///			SELECT @RV, @RM -- @RV:(0=OK, otherwise NOK), @RM:message with the result description
+		///		END
+		/// </param>
+		/// <param name="ExitAtThisPoint">az a függvény, ami minde run után végrehajtásra kerül; 
+		///		bemenő paramétere az előző run eredménye, 
+		///		kimenő paramétere pedig igaz, ha ki kell lépni a végrehajtásból.
+		/// </param>
+		/// <returns></returns>
-            bool par_testmode;
-            int par_limitdays;
-            DateTime par_limitdate;
-            TimeSpan par_lengthofonerun;
-            TimeSpan par_delaybetweenruns;
+        public static ReturnInfoJSON ExecuteMultirunSQLScript(SqlConnection sqlc, SQLDataBase.SQLScript sqlscript, Func<ReturnInfoJSON,TimeSpan?, bool> ExitAtThisPoint=null)
+        {
+            ReturnInfoJSON ret1=null;
+			string sqltxt = null;
+			int? getdbnumofrowsresult=null;
+			DateTime? getdbmindateresult=null;
-            #region parameterek feldolgozása
-            var testmodestring = argkvplist.GetValue(XMLPAR_TESTMODE, "false"); 
-			if ( !bool.TryParse(testmodestring, out par_testmode)) { return Finalize(1, Add(multirunresult, "Result", $"Parameter error:{XMLPAR_TESTMODE}")); }
+            var multirunresult = new List<KeyValuePair<string, string>>();
-            var daysbackstring = argkvplist.GetValue(XMLPAR_DAYSBACK, null);
-			var limitdatestring = argkvplist.GetValue(XMLPAR_LIMITDATE, null);
-			if (daysbackstring == null && limitdatestring == null) { par_limitdays = 90; par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0)); }
-			else if (!string.IsNullOrEmpty(daysbackstring) && !string.IsNullOrEmpty(limitdatestring)) { return Finalize(1, Add(multirunresult, "Result", $"Parameter error:{XMLPAR_DAYSBACK} and {XMLPAR_LIMITDATE} are both defined.")); }
-			else if (!string.IsNullOrEmpty(limitdatestring)) 
-			{ 
-				if (!DateTime.TryParse(limitdatestring, out par_limitdate)) return Finalize(1, Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_LIMITDATE));
-				par_limitdays = (int)DateTime.Now.Subtract(par_limitdate).TotalDays;
-			}
-            else /*if (!string.IsNullOrEmpty(daysbackstring)) */
-            { 
-				if(!int.TryParse(daysbackstring, out par_limitdays)) return Finalize(1, Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_DAYSBACK));
-                par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0));
-            }
+            var scriptparameterkvplist = (new Tools.KvpString(sqlscript.ScriptParameters)).ResolveInteractive();
+			string sqltxtalmostresolved = scriptparameterkvplist.Substitute(sqlscript.ScriptText); //parameters of the run are still unresolved
+			if (sqltxtalmostresolved == null) {return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE));} //won't really get, but we never know...
-            if (!TimeSpan.TryParse(argkvplist.GetValue(XMLPAR_NUMOFDAYSINONERUN, "#$NONE#$"), out par_lengthofonerun)) { par_lengthofonerun = new TimeSpan(0, 12, 0); }
-            if (!TimeSpan.TryParse(argkvplist.GetValue(XMLPAR_DELAYBETWEENRUNS, "#$NONE#$"), out par_delaybetweenruns)) { par_delaybetweenruns = new TimeSpan(0, 0, 10); }
-            #endregion parameterek feldolgozása
-			if (par_limitdays<=0) { return Finalize(0, Add(multirunresult, "Result", $"SKIPPED (function disabled).")); }
+            //get number of total records in the database
+            getdbnumofrowsresult = GetDBNumofRows(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc);
+            if (getdbnumofrowsresult == null) return Finalize(1, multirunresult);
+            int numoftotaldbrecords_before = getdbnumofrowsresult.Value;
-            Add(multirunresult, $"LIMIT", $"{par_limitdays}days (before:{par_limitdate})");
-            Add(multirunresult, $"STAT", $"run length:{par_lengthofonerun.TotalHours}hours, delay between runs:{par_delaybetweenruns.TotalSeconds}sec");
-            Add(multirunresult, $"TESTMODE", $"{par_testmode}");
+            //get minimum date in the database
+            getdbmindateresult = GetDBMindate(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc);
+            if (getdbmindateresult == null) return Finalize(1, multirunresult);
+            DateTime mindateTS_before = getdbmindateresult.Value;
+			var _multirunresult = multirunresult.Select(kvp => new KeyValuePair<string, string>(kvp.Key, kvp.Value)).ToList();
+            Add(_multirunresult, $"DBRECORDS", $"{numoftotaldbrecords_before}");
+            Add(_multirunresult, $"MINDATE", $"{mindateTS_before}");
+
+            var exithere = (ExitAtThisPoint?.Invoke(Finalize(0, _multirunresult),null)) ?? false;
+            if (exithere) { Add(_multirunresult, $"Exit requested by user"); return Finalize(0, _multirunresult); }
+
+            var multirunparameterskvplist = (new Tools.KvpString(sqlscript.MultirunParameters)).ResolveInteractive();
+			if(multirunparameterskvplist == null) { return Finalize(0, Add(multirunresult, ERRMSG_NOMULTIRUNPARAMETERS)); } //user exit with selecting EX
+			var smrp = SetMultirunParameters(multirunparameterskvplist, multirunresult);
+			if (smrp == null) { return Finalize(1, multirunresult);}
+			(bool par_testmode, DateTime par_limitdate, TimeSpan par_lengthofonerun, TimeSpan par_delaybetweenruns) = smrp.Value;
             try
             {
 				DateTime starttime = DateTime.Now;
-				string sqltxtalmostresolved = argkvplist.Substitute(sqlscript.ScriptText); //parameters of the run are still unresolved
-				if (sqltxtalmostresolved == null) {return Finalize(1, Add(multirunresult, ERRMSG_NOTHINGTOEXECUTE));} //won't really get, but we never know...
-
-                ReturnInfoJSON ret1=null;
-				string sqltxt = null;
-				int? getdbnumofrowsresult=null;
-				DateTime? getdbmindateresult=null;
-
-				//get number of total records in the database
-				getdbnumofrowsresult = GetDBNumofRows(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc);
-                if (getdbnumofrowsresult == null) return Finalize(1, multirunresult);
-                int numoftotaldbrecords_before = getdbnumofrowsresult.Value;
-
-				//get minimum date in the database
-                getdbmindateresult = GetDBMindate(sqltxtalmostresolved, multirunresult, sqlscript.CommandTimeout, sqlc);
-                if (getdbmindateresult == null) return Finalize(1, multirunresult);
-                DateTime mindateTS_before = getdbmindateresult.Value;
-
                 var limitdatefornextrun = mindateTS_before;
                 int exceptioncounter = 0;
 				const int MAXEXCEPTIONS = 3; //after this number of subsequent exceptions we exit
@@ -2064,7 +2051,7 @@ GO
                         runresult = 1;
                         if (exceptioncounter > MAXEXCEPTIONS) { return Finalize(1, multirunresult); }
                     }
-                    var exitfromloop = (ExitAfterOneRun?.Invoke(Finalize(runresult, loople))) ?? false;
+                    var exitfromloop = (ExitAtThisPoint?.Invoke(Finalize(runresult, loople),new TimeSpan(0,0,5))) ?? false;
                     if (exitfromloop) { Add(multirunresult, $"Exit requested by user"); break; }
                     Thread.Sleep((int)(par_delaybetweenruns.TotalMilliseconds));
                 }
@@ -2087,6 +2074,43 @@ GO
             }
             catch (Exception ex) { return Finalize(1, Add(multirunresult, ex)); }
         }
+		private static (bool par_testmode, DateTime par_limitdate, TimeSpan par_lengthofonerun, TimeSpan par_delaybetweenruns)? SetMultirunParameters(Tools.KvpString argkvplist,List<KeyValuePair<string, string>> multirunresult) 
+		{
+            bool par_testmode;
+            int par_limitdays;
+            DateTime par_limitdate;
+            TimeSpan par_lengthofonerun;
+            TimeSpan par_delaybetweenruns;
+
+            #region parameterek feldolgozása
+            var testmodestring = argkvplist.GetValue(XMLPAR_TESTMODE, "false");
+            if (!bool.TryParse(testmodestring, out par_testmode)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_TESTMODE}"); return null; }
+
+            var daysbackstring = argkvplist.GetValue(XMLPAR_DAYSBACK, null);
+            var limitdatestring = argkvplist.GetValue(XMLPAR_LIMITDATE, null);
+			if (daysbackstring == null && limitdatestring == null) { par_limitdays = 90; par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0)); }
+			else if (!string.IsNullOrEmpty(daysbackstring) && !string.IsNullOrEmpty(limitdatestring)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_DAYSBACK} and {XMLPAR_LIMITDATE} are both defined."); return null; }
+			else if (!string.IsNullOrEmpty(limitdatestring))
+			{
+				if (!DateTime.TryParse(limitdatestring, out par_limitdate)) { Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_LIMITDATE); return null; }
+				par_limitdays = (int)DateTime.Now.Subtract(par_limitdate).TotalDays;
+			}
+			else /*if (!string.IsNullOrEmpty(daysbackstring)) */
+			{
+				if (!int.TryParse(daysbackstring, out par_limitdays)) { Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_DAYSBACK); return null; }
+                par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0));
+            }
+
+            if (!TimeSpan.TryParse(argkvplist.GetValue(XMLPAR_NUMOFDAYSINONERUN, "#$NONE#$"), out par_lengthofonerun)) { par_lengthofonerun = new TimeSpan(0, 12, 0); }
+            if (!TimeSpan.TryParse(argkvplist.GetValue(XMLPAR_DELAYBETWEENRUNS, "#$NONE#$"), out par_delaybetweenruns)) { par_delaybetweenruns = new TimeSpan(0, 0, 10); }
+            #endregion parameterek feldolgozása
+            if (par_limitdays <= 0) { Add(multirunresult, "Result", $"SKIPPED (function disabled).");  return null; }
+
+            Add(multirunresult, $"LIMIT", $"{par_limitdays}days (before:{par_limitdate})");
+            Add(multirunresult, $"STAT", $"run length:{par_lengthofonerun.TotalHours}hours, delay between runs:{par_delaybetweenruns.TotalSeconds}sec");
+            Add(multirunresult, $"TESTMODE", $"{par_testmode}");
+            return (par_testmode, par_limitdate, par_lengthofonerun, par_delaybetweenruns);
+        }
 		private static DateTime? GetDBMindate(string sqltxtalmostresolved, List<KeyValuePair<string, string>> multirunresult,int commandtimeout, SqlConnection sqlc) 
 		{
             //get minimum date in the database
@@ -2118,6 +2142,7 @@ GO
         const string XMLPAR_LIMITDATE = "LIMITDATE";
         const string ERRMSG_NOTHINGTOEXECUTE = "FAILURE! Nothing to execute! Check script definition entry!";
+        const string ERRMSG_NOMULTIRUNPARAMETERS = "FAILURE! Multirun parameters are not defined!";
         private static List<KeyValuePair<string, string>> Add(List<KeyValuePair<string, string>> kvp, string a, string b=null) { kvp.Add(new KeyValuePair<string, string>(a, b)); return kvp; }
         private static List<KeyValuePair<string, string>> Add(List<KeyValuePair<string, string>> kvp,Exception ex) { string errmsg = ""; while (ex != null) { errmsg += ex.Message; ex = ex.InnerException; } return Add(kvp, "EXCEPTION RESULT",errmsg); }
@@ -2832,7 +2857,7 @@ GO
 							public static class Description { public static class Values { public const string DEFAULT = ""; } }
 							public static class ScriptCommandTimeout { public static class Values { public const int DEFAULT = 10000; } }
 							public static class Parameters { public static class Values { public const string DEFAULT = ""; } }
-							public static class Multirun { public static class Values { public const bool DEFAULT = false; } }
+							public static class Multirun { public static class Values { public const string DEFAULT = ""; } }
 						}
 					}
 				}
@@ -2848,23 +2873,23 @@ GO
 			public string Description = "";
 			public string ScriptText = "";
 			public int CommandTimeout = 10000;
-			public string ArgumentParameters;
-			public bool Multirun = false;
+			public string ScriptParameters=null;
+			public string MultirunParameters=null;
 			public SQLScript() { }
 			public SQLScript(SQLScript sqls) { Name = sqls.Name; Description = sqls.Description; ScriptText= sqls.ScriptText; }
 			public SQLScript(XElement sqlscriptXml, int defaultcommandtimeout, int index)
             {
-				ArgumentParameters = GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Parameters), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Parameters.Values.DEFAULT);
+				ScriptParameters = GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Parameters), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Parameters.Values.DEFAULT);
+				MultirunParameters= GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Multirun), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Multirun.Values.DEFAULT);
 				Key = $"S{index}";
 				Name = GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Name), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Name.Values.DEFAULT);
 				FilePath = GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.File), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.File.Values.DEFAULT);
 				Description= GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Description), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Description.Values.DEFAULT);
-				Multirun= GetValue(nameof(XmlStructure.SQLDataBase.Scripts.Script.Attributes.Multirun), sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Attributes.Multirun.Values.DEFAULT);
-                Tools.KvpString.Resolve(ArgumentParameters, this.Name, out this.Name, disableinteractive: true);
-                Tools.KvpString.Resolve(ArgumentParameters, this.Description, out this.Description, disableinteractive: true);
+                Tools.KvpString.Resolve(ScriptParameters, this.Name, out this.Name, disableinteractive: true);
+                Tools.KvpString.Resolve(ScriptParameters, this.Description, out this.Description, disableinteractive: true);
 				if (string.IsNullOrWhiteSpace(this.FilePath))
 				{
 					ScriptText = GetValue(sqlscriptXml, XmlStructure.SQLDataBase.Scripts.Script.Values.DEFAULT);
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.31.0.0")]
-[assembly: AssemblyFileVersion("1.31.0.0")]
+[assembly: AssemblyVersion("1.31.1.0")]
+[assembly: AssemblyFileVersion("1.31.1.0")]