Working on refining replacement

Author: erikbra

grate.unittests/Basic/Infrastructure/Oracle/Statement_Splitting/BatchSplitterReplacer_.cs

@@ -264,8 +264,10 @@ public void slash_with_comment_after()
         [Test]
         public void slash_with_semicolon_directly_after()
         {
-            string sql_to_match = "jalla /;";
-            string expected_scrubbed = "jalla " + Batch_terminator_replacement_string + ";";
+            string sql_to_match = @"jalla;
+/";
+            string expected_scrubbed = "jalla" + Batch_terminator_replacement_string + @"
+" + Batch_terminator_replacement_string;
             TestContext.WriteLine(sql_to_match);
             string sql_statement_scrubbed = Replacer.Replace(sql_to_match);
             Assert.AreEqual(expected_scrubbed, sql_statement_scrubbed);

grate.unittests/Basic/Infrastructure/Oracle/Statement_Splitting/StatementSplitter_.cs

@@ -1,4 +1,5 @@
-using FluentAssertions;
+using System.Linq;
+using FluentAssertions;
 using grate.Infrastructure;
 using grate.Migration;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -15,7 +16,7 @@ public class StatementSplitter_
     private static readonly StatementSplitter Splitter = new(Database.StatementSeparatorRegex);
 
     [Test]
-    public void Splits_and_removes_GO_statements()
+    public void Splits_and_removes_slashes_and_semicolon()
     {
         var original = @"
 SELECT * FROM v$version WHERE banner LIKE 'Oracle%';
@@ -27,6 +28,20 @@ SELECT 1
         var batches = Splitter.Split(original);
 
         batches.Should().HaveCount(2);
+        batches.First().Should().NotEndWith(";");
+    }
+    
+    [Test]
+    public void Splits_and_removes_semicolon()
+    {
+        var original = @"
+SELECT * FROM v$version WHERE banner LIKE 'Oracle%';
+SELECT 1
+";
+        var batches = Splitter.Split(original).ToArray();
+        
+        batches.Should().HaveCount(2);
+        batches.First().Should().NotEndWith(";");
     }
 
 }

grate.unittests/Oracle/Running_MigrationScripts/With_batch_separator.cs

@@ -0,0 +1,63 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Dapper;
+using FluentAssertions;
+using grate.Configuration;
+using grate.Migration;
+using grate.unittests.TestInfrastructure;
+using NUnit.Framework;
+using static grate.Configuration.KnownFolderKeys;
+
+namespace grate.unittests.Oracle.Running_MigrationScripts;
+
+[TestFixture]
+[Category("Oracle")]
+// ReSharper disable once InconsistentNaming
+public class With_batch_separator: Generic.Running_MigrationScripts.MigrationsScriptsBase
+{
+    protected override IGrateTestContext Context => GrateTestContext.Oracle;
+    
+    [Test()]
+    public async Task Separates_multiple_statements()
+    {
+        var db = TestConfig.RandomDatabase();
+
+        var parent = TestConfig.CreateRandomTempDirectory();
+        var knownFolders = FoldersConfiguration.Default(null);
+        GrateMigrator? migrator;
+
+        
+        var path = new DirectoryInfo(Path.Combine(parent.ToString(), knownFolders[Up]!.Path));
+        const string filename = "multiple_statements.sql";
+        
+        const string fileContent = @"
+create table table_one (
+   col  number
+);
+/
+
+create table table_two (
+   col number
+)
+";
+        
+        WriteSql(path, filename, fileContent);
+
+        await using (migrator = Context.GetMigrator(db, parent, knownFolders))
+        {
+            await migrator.Migrate();
+        }
+
+        string[] scripts;
+        string sql = $"SELECT text_of_script FROM {Context.Syntax.TableWithSchema("grate", "ScriptsRun")}";
+
+        await using (var conn = Context.CreateDbConnection(db))
+        {
+            scripts = (await conn.QueryAsync<string>(sql)).ToArray();
+        }
+
+        scripts.Should().HaveCount(2);
+    }
+
+}

grate.unittests/TestInfrastructure/OracleSplitterContext.cs

@@ -30,14 +30,6 @@ public static class FullSplitter
 
 /* / */
 
-BOB7
-
-/* 
-
-/
-
-*/
-
 BOB8
 
 --
@@ -121,14 +113,6 @@ INSERT [dbo].[Foo] ([Bar]) VALUES (N'/ speed racer, / speed racer, / speed racer
 
 /* / */
 
-BOB7
-
-/* 
-
-/
-
-*/
-
 BOB8
 
 --
@@ -164,7 +148,7 @@ yeppsasd decimal(20, 6) NULL,
 	uhuhhh datetime NULL,
 	slsald varchar(15) NULL,
 	uhasdf varchar(15) NULL,
-    daf_asdfasdf DECIMAL(20,6) NULL;
+    daf_asdfasdf DECIMAL(20,6) NULL
 " + StatementSplitter.BatchTerminatorReplacementString + @"
 
 EXEC @ReturnCode = msdb.dbo.sp_add_jobstep @job_id=@jobId, @step_name=N'Daily job', 

grate/Infrastructure/OracleSyntax.cs

@@ -11,8 +11,9 @@ public string StatementSeparatorRegex
             const string strings = @"(?<KEEP1>'[^']*')";
             const string dashComments = @"(?<KEEP1>--.*$)";
             const string starComments = @"(?<KEEP1>/\*[\S\s]*?\*/)";
-            const string separator = @"(?<KEEP1>^|\s)(?<BATCHSPLITTER>/)(?<KEEP2>\s|;|$)";
-            return strings + "|" + dashComments + "|" + starComments + "|" + separator;
+            const string batchSeparator = @"(?<KEEP1>.*)(?<BATCHSPLITTER>;)(?<KEEP2>\s|$)";
+            const string sqlPlusExecuteCommand = @"(?<KEEP1>^|\s)(?<BATCHSPLITTER>/)(?<KEEP2>\s|$)";
+            return strings + "|" + dashComments + "|" + starComments + "|" + batchSeparator + "|" + sqlPlusExecuteCommand;
         }
     }