Test application can now split by SQL instruction

Author: Mark Junker

TestSqlServerBatchParser/Program.cs

@@ -15,20 +15,24 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Text.RegularExpressions;
+using System.Text;
 
 using FluentMigrator.BatchParser;
+using FluentMigrator.BatchParser.RangeSearchers;
 using FluentMigrator.BatchParser.Sources;
 using FluentMigrator.BatchParser.SpecialTokenSearchers;
 
 using McMaster.Extensions.CommandLineUtils;
 
 namespace TestSqlServerBatchParser
 {
-    class Program
+    internal static class Program
     {
-        private static string _sqlText;
+        private static StringBuilder _sqlText;
+        private static string _sqlStatement;
+        private static bool _outputEverySqlStatement;
 
         static int Main(string[] args)
         {
@@ -37,12 +41,38 @@ static int Main(string[] args)
 
             var scriptFileName = app.Argument<string>("script", "SQL script file name")
                                     .IsRequired();
-            var stripComments = app.Option("-s|--strip", "Strip comments", CommandOptionType.NoValue);
+            var stripComments = app.Option("--strip", "Strip comments", CommandOptionType.NoValue);
+            var singleStatement = app.Option("-s|--single", "Output single statements", CommandOptionType.NoValue);
 
             app.OnExecute(
                 () =>
                 {
-                    var batchParser = new SqlServerBatchParser();
+                    // The default range searchers
+                    var rangeSearchers = new List<IRangeSearcher>
+                    {
+                        new MultiLineComment(),
+                        new DoubleDashSingleLineComment(),
+                        new PoundSignSingleLineComment(),
+                        new SqlString(),
+                    };
+
+                    // The special token searchers
+                    var specialTokenSearchers = new List<ISpecialTokenSearcher>();
+
+                    // Add SQL server specific range searcher
+                    rangeSearchers.Add(new SqlServerIdentifier());
+
+                    // Add SQL server specific token searcher
+                    specialTokenSearchers.Add(new GoSearcher());
+
+                    // We want every single SQL statement
+                    _outputEverySqlStatement = singleStatement.HasValue();
+                    if (_outputEverySqlStatement)
+                    {
+                        specialTokenSearchers.Add(new SemicolonSearcher());
+                    }
+
+                    var batchParser = new SqlBatchParser(rangeSearchers, specialTokenSearchers);
                     batchParser.SpecialToken += BatchParserOnSpecialToken;
                     batchParser.SqlText += BatchParserOnSqlText;
 
@@ -61,24 +91,43 @@ static int Main(string[] args)
 
         private static void BatchParserOnSqlText(object sender, SqlTextEventArgs sqlTextEventArgs)
         {
-            _sqlText = sqlTextEventArgs.SqlText.Trim();
+            var content = sqlTextEventArgs.SqlText.Trim();
+            if (_outputEverySqlStatement)
+            {
+                if (_sqlText == null)
+                    _sqlText = new StringBuilder();
+                if (!string.IsNullOrEmpty(content))
+                {
+                    _sqlText.Append(content).Append(';').AppendLine();
+                    _sqlStatement = content;
+                }
+            }
+            else
+            {
+                _sqlText = new StringBuilder(sqlTextEventArgs.SqlText.Trim());
+            }
         }
 
         private static void BatchParserOnSpecialToken(object sender, SpecialTokenEventArgs specialTokenEventArgs)
         {
             if (specialTokenEventArgs.Opaque is GoSearcher.GoSearcherParameters goParameters)
             {
                 RunSql(goParameters.Count);
+                _sqlText = null;
+            }
+            else if (!string.IsNullOrEmpty(_sqlStatement))
+            {
+                Console.Out.WriteLine("Statement: {0};", _sqlStatement);
+                _sqlStatement = null;
             }
-
-            _sqlText = null;
         }
 
         private static void RunSql(int count = 1)
         {
-            if (string.IsNullOrEmpty(_sqlText))
+            if ((_sqlText?.Length ?? 0) == 0)
                 return;
 
+            Console.Out.WriteLine("Executing batch:");
             for (var i = 0; i != count; ++i)
             {
                 Console.WriteLine(_sqlText);

TestSqlServerBatchParser/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "TestSqlServerBatchParser": {
       "commandName": "Project",
-      "commandLineArgs": "test.sql -s"
+      "commandLineArgs": "test.sql -s --strip"
     }
   }
 }