Merge pull request #6 from epenet/20240305-1209

Fix DELIMITER handling
DbUp · Oct 23, 2024 · 8cb2925 · 8cb2925
2 parents 6521d77 + 6b31d1c
commit 8cb2925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/dbup-oracle/OracleCommandReader.cs b/src/dbup-oracle/OracleCommandReader.cs
@@ -20,7 +20,8 @@ public class OracleCommandReader : SqlCommandReader
         /// Hook to support custom statements
         /// </summary>
         protected override bool IsCustomStatement => TryPeek(DelimiterKeyword.Length, out var statement) &&
-                                                     string.Equals(DelimiterKeyword, statement, StringComparison.OrdinalIgnoreCase);
+                                                     string.Equals(DelimiterKeyword, statement, StringComparison.OrdinalIgnoreCase) &&
+                                                     string.IsNullOrEmpty(GetCurrentCommandTextFromBuffer());
 
         /// <summary>
         /// Read a custom statement

diff --git a/src/dbup-oracle/OracleCustomDelimiterCommandReader.cs b/src/dbup-oracle/OracleCustomDelimiterCommandReader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using DbUp.Support;
 
@@ -20,7 +20,8 @@ public OracleCustomDelimiterCommandReader(string sqlText, char delimiter) : base
         /// </summary>
         protected override bool IsCustomStatement
             => TryPeek(DelimiterKeyword.Length - 1, out var statement) &&
-               string.Equals(DelimiterKeyword, CurrentChar + statement, StringComparison.OrdinalIgnoreCase);
+               string.Equals(DelimiterKeyword, CurrentChar + statement, StringComparison.OrdinalIgnoreCase) &&
+               string.IsNullOrEmpty(GetCurrentCommandTextFromBuffer());
 
         /// <summary>
         /// Read a custom statement