fix: #680 PostgreSQL statements split implemented

Co-authored-by: shokurov <[email protected]>

Author: campbellhardingdeason

src/Tests/PostgresqlQueryParserTests.cs

@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace DbUp.Postgresql.Tests;
+
+public class PostgresqlQueryParserTests
+{
+    [Theory]
+    [InlineData("SELECT 1\n;\nSELECT 2", 2, "SELECT 1", "SELECT 2")]
+    [InlineData(";;SELECT 1", 1, "SELECT 1")]
+    [InlineData("SELECT 1;", 1, "SELECT 1")]
+    [InlineData("", 0)]
+    [InlineData("CREATE OR REPLACE RULE test AS ON UPDATE TO test DO (SELECT 1; SELECT 1)",
+        1,
+        "CREATE OR REPLACE RULE test AS ON UPDATE TO test DO (SELECT 1; SELECT 1)")]
+    [InlineData("CREATE OR REPLACE RULE test AS ON UPDATE TO test DO (SELECT 1); SELECT 2",
+        2,
+        "CREATE OR REPLACE RULE test AS ON UPDATE TO test DO (SELECT 1)", "SELECT 2")]
+    [InlineData("SELECT 1 /* block comment; */", 1, "SELECT 1 /* block comment; */")]
+    [InlineData(
+        """
+        SELECT 1;
+        -- Line comment; with semicolon
+        SELECT 2;
+        """, 2,
+        "SELECT 1",
+        """
+        -- Line comment; with semicolon
+        SELECT 2
+        """)]
+    [InlineData("SELECT 'string with; semicolon'", 1, "SELECT 'string with; semicolon'")]
+    [InlineData("SELECT 'string with'' quote and; semicolon'", 1, "SELECT 'string with'' quote and; semicolon'")]
+    [InlineData("""
+                CREATE FUNCTION TXT()
+                LANGUAGE PLPGSQL AS
+                $BODY$
+                BEGIN
+                    SELECT 'string with'' quote and; semicolon';
+                END
+                $BODY$
+                """, 1)]
+    [InlineData("SELECT 1 as \"QUOTED;IDENT\"", 1)]
+    [InlineData("SELECT E'\\041'; SELECT '1'", 2, "SELECT E'\\041'", "SELECT '1'")]
+    [InlineData("""
+                SELECT 'some'
+                'text';
+                SELECT '1'
+                """, 2)]
+    public void split_into_statements(string sql, int statementCount, params string[] expected)
+    {
+        var results = ParseCommand(sql);
+        Assert.Equal(statementCount, results.Count);
+        if (expected.Length > 0)
+            Assert.Equal(expected, results);
+    }
+
+    [Fact]
+    public void split_into_statements_non_sql_standard()
+    {
+        const string sql = "SELECT 'string with\\' quote and; semicolon'";
+        var results = ParseCommand(sql, false);
+        Assert.Single(results);
+        Assert.Equal(sql, results[0]);
+    }
+
+    private List<string> ParseCommand(string sql)
+        => ParseCommand(sql, true);
+
+    private static List<string> ParseCommand(string sql, bool standardConformingStrings)
+    {
+        var manager = new PostgresqlConnectionManager("") { StandardConformingStrings = standardConformingStrings };
+        var commands = manager.SplitScriptIntoCommands(sql);
+        return commands.ToList();
+    }
+}

src/dbup-postgresql/PostgresqlConnectionManager.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
-using System.Text.RegularExpressions;
 using DbUp.Engine.Transactions;
 using Npgsql;
 
@@ -12,6 +11,11 @@ namespace DbUp.Postgresql
     /// </summary>
     public class PostgresqlConnectionManager : DatabaseConnectionManager
     {
+        /// <summary>
+        /// Disallow single quotes to be escaped with a backslash (\')
+        /// </summary>
+        public bool StandardConformingStrings { get; set; } = true;
+
         /// <summary>
         /// Creates a new PostgreSQL database connection.
         /// </summary>
@@ -35,7 +39,7 @@ public PostgresqlConnectionManager(string connectionString, X509Certificate2 cer
 
                     return databaseConnection;
                 }
-                ))
+            ))
         {
         }
 
@@ -46,7 +50,7 @@ public PostgresqlConnectionManager(string connectionString, X509Certificate2 cer
         public override IEnumerable<string> SplitScriptIntoCommands(string scriptContents)
         {
             var scriptStatements =
-                Regex.Split(scriptContents, "^\\s*;\\s*$", RegexOptions.IgnoreCase | RegexOptions.Multiline)
+                PostgresqlQueryParser.ParseRawQuery(scriptContents, StandardConformingStrings)
                     .Select(x => x.Trim())
                     .Where(x => x.Length > 0)
                     .ToArray();