Allow setting 0 as Lines per Batch (will make breaks only on GO statements).

Allow setting up to 500000 lines per batch (previous limit was 5000)
Append the error line to the error logs filename.
Check for empty statement before running it.

Author: danarrib

BigSQLRunnerUI/frmMainUI.cs

@@ -60,24 +60,24 @@ private void btnRunScript_Click(object sender, EventArgs e)
             if (!TestConnectionString(strConnectionString))
                 return;
 
-            short sLinesPerBatch = 0;
+            long sLinesPerBatch = 0;
             long lStartingLine = 0;
 
-            if (!short.TryParse(strLinesPerBatch, out sLinesPerBatch))
+            if (!long.TryParse(strLinesPerBatch, out sLinesPerBatch))
             {
                 MessageBox.Show("Invalid value on the lines per batch field!", "Invalid value!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 return;
             }
 
-            if (sLinesPerBatch <= 0)
+            if (sLinesPerBatch < 0)
             {
                 MessageBox.Show("Invalid value on the lines per batch field! Value must be positive!", "Invalid value!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 return;
             }
 
-            if (sLinesPerBatch > 5000)
+            if (sLinesPerBatch > 500000)
             {
-                MessageBox.Show("Invalid value on the lines per batch field! Value is limited to 5000.", "Invalid value!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                MessageBox.Show("Invalid value on the lines per batch field! Value is limited to 500000.", "Invalid value!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 return;
             }
 
@@ -232,6 +232,7 @@ public void ControlScreen(bool bEnable)
             txtStartingLine.Enabled = bEnable;
             chkStopOnError.Enabled = bEnable;
             btnStop.Enabled = !bEnable;
+            chkLogErrors.Enabled = bEnable;
             Cursor.Current = bEnable ? Cursors.Default : Cursors.WaitCursor;
             this.UseWaitCursor = !bEnable;
         }
@@ -254,17 +255,17 @@ public void UpdateProgressBar(int percent)
             }
         }
 
-        private bool RunScript(string sourceScript, string connectionString, short qtyMaxLines, long startLine)
+        private bool RunScript(string sourceScript, string connectionString, long qtyMaxLines, long startLine)
         {
             SqlConnection conn = new SqlConnection(connectionString);
             conn.Open();
 
             // Config
             string line;
-            string errorFile = sourceScript + ".error";
+            string errorFile = sourceScript + ".[linenumber].error";
             long qtyErrorLines = 0;
             long qtyLines = 0;
-            short control = 0;
+            long control = 0;
             Stopwatch watchtotal = Stopwatch.StartNew();
 
             long totalLines = CountLines(sourceScript);
@@ -297,31 +298,35 @@ private bool RunScript(string sourceScript, string connectionString, short qtyMa
                     sb.AppendLine(line);
                 }
 
-                if (control >= qtyMaxLines || isGO)
+                if ((control >= qtyMaxLines && qtyMaxLines > 0) || isGO)
                 {
-                    using (SqlCommand comm = new SqlCommand(sb.ToString(), conn))
+                    if (sb.Length > 0)
                     {
-                        comm.CommandTimeout = 3600; // 1 hour
-                        try
+                        using (SqlCommand comm = new SqlCommand(sb.ToString(), conn))
                         {
-                            comm.ExecuteScalar();
-                        }
-                        catch (Exception ex)
-                        {
-                            if (LogErrors)
+                            comm.CommandTimeout = 3600; // 1 hour
+                            try
+                            {
+                                comm.ExecuteScalar();
+                            }
+                            catch (Exception ex)
                             {
-                                string errormsg = "/* The error was: \n" + ex.Message + "\n*/";
-                                // Save the chuncks that could not be processed
-                                File.AppendAllText(errorFile, sb.ToString() + Environment.NewLine);
-                                File.AppendAllText(errorFile, errormsg + Environment.NewLine);
+                                if (LogErrors)
+                                {
+                                    string errormsg = "/* The error was: \n" + ex.Message + "\n*/";
+                                    // Save the chuncks that could not be processed
+                                    File.AppendAllText(errorFile.Replace("[linenumber]", qtyLines.ToString()), sb.ToString() + Environment.NewLine);
+                                    File.AppendAllText(errorFile.Replace("[linenumber]", qtyLines.ToString()), errormsg + Environment.NewLine);
+                                }
+                                qtyErrorLines++;
+                                if (StopOnError)
+                                    AllowToRun = false;
                             }
-                            qtyErrorLines++;
-                            if (StopOnError)
-                                AllowToRun = false;
+                            control = 0;
+                            sb.Clear();
                         }
-                        control = 0;
-                        sb.Clear();
                     }
+
                     // Update screen
                     double percentComplete = (qtyLines.ToDouble() / totalLines.ToDouble()) * 100.0;
                     long ticksLeft = Convert.ToInt64((totalLines.ToDouble() - qtyLines.ToDouble()) * (watch.ElapsedTicks / qtyLines.ToDouble()));
@@ -341,7 +346,7 @@ private bool RunScript(string sourceScript, string connectionString, short qtyMa
             }
 
             // Finished reading file. Check if there's still lines to run
-            if (control > 0 && AllowToRun)
+            if (control > 0 && AllowToRun && sb.Length > 0)
             {
                 using (SqlCommand comm = new SqlCommand(sb.ToString(), conn))
                 {
@@ -356,8 +361,8 @@ private bool RunScript(string sourceScript, string connectionString, short qtyMa
                         {
                             string errormsg = "/* The error was: \n" + ex.Message + "\n*/";
                             // Save the chuncks that could not be processed
-                            File.AppendAllText(errorFile, sb.ToString() + Environment.NewLine);
-                            File.AppendAllText(errorFile, errormsg + Environment.NewLine);
+                            File.AppendAllText(errorFile.Replace("[linenumber]", qtyLines.ToString()), sb.ToString() + Environment.NewLine);
+                            File.AppendAllText(errorFile.Replace("[linenumber]", qtyLines.ToString()), errormsg + Environment.NewLine);
                         }
                         qtyErrorLines++;
                         if (StopOnError)
@@ -377,7 +382,7 @@ private bool RunScript(string sourceScript, string connectionString, short qtyMa
 
             if (qtyErrorLines > 0 && AllowToRun)
             {
-                string errorMessage = string.Format("{0} lines were not loaded. Please check the error file {1}", qtyErrorLines, errorFile);
+                string errorMessage = string.Format("{0} lines were not loaded. Please check the error files {1}", qtyErrorLines, errorFile);
                 MessageBox.Show(errorMessage, "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
 
@@ -408,6 +413,7 @@ private long CountLines(string inputFileFullPath)
                     }
                 }
             }
+
             return lineCount;
         }