Fixed double replacement tokens

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

@@ -262,11 +262,11 @@ public void slash_with_comment_after()
  }
 
  [Test]
- public void slash_with_semicolon_directly_after()
+ public void slash_with_semicolon_directly_after_yields_just_one_splitter()
  {
  string sql_to_match = @"jalla;
 /";
- string expected_scrubbed = "jalla" + Batch_terminator_replacement_string + @"
+ string expected_scrubbed = "jalla" + @"
 " + Batch_terminator_replacement_string;
  TestContext.WriteLine(sql_to_match);
  string sql_statement_scrubbed = Replacer.Replace(sql_to_match);

grate/Infrastructure/BatchSplitterReplacer.cs

@@ -14,12 +14,23 @@ public BatchSplitterReplacer(string pattern, string replacement)
  _regex = new Regex(pattern, IgnoreCase | Multiline);
  }
 
- public string Replace(string text) => _regex.Replace(text, ReplaceBatchSeparator);
+ public string Replace(string text)
+ {
+ var replace = _regex.Replace(text, ReplaceBatchSeparator);
+
+ // Combine multiple consecutive replacement tokens with one (needed for Oracle, if ; and / are on separate lines)
+ replace = Regex.Replace(
+ replace, 
+ Regex.Escape(Replacement) + "(\\s*)" + Regex.Escape(Replacement),
+ "$1" + Replacement);
+
+ return replace;
+ }
 
  private string ReplaceBatchSeparator(Match match)
  {
  var groups = match.Groups;
  var replacement = groups["BATCHSPLITTER"].Success ? Replacement : string.Empty;
  return groups["KEEP1"].Value + replacement + groups["KEEP2"].Value;
  }
-}
+}

grate/Infrastructure/OracleSyntax.cs

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