Fixup to 44f7f9c

roji · roji · commit 9d2b3dc5dc30 · 2022-10-15T08:37:37.000+02:00
Make tests pass on PG10
diff --git a/test/Npgsql.Tests/BatchTests.cs b/test/Npgsql.Tests/BatchTests.cs
@@ -162,33 +162,38 @@ public async Task Merge_RecordsAffected_and_Rows()
         await reader.CloseAsync();
 
         var command = batch.BatchCommands[0];
+        Assert.That(command.StatementType, Is.EqualTo(StatementType.Merge));
         Assert.That(command.RecordsAffected, Is.EqualTo(2));
         Assert.That(command.Rows, Is.EqualTo(2));
 
         command = batch.BatchCommands[1];
+        Assert.That(command.StatementType, Is.EqualTo(StatementType.Merge));
         Assert.That(command.RecordsAffected, Is.EqualTo(1));
         Assert.That(command.Rows, Is.EqualTo(1));
 
         command = batch.BatchCommands[2];
+        Assert.That(command.StatementType, Is.EqualTo(StatementType.Merge));
         Assert.That(command.RecordsAffected, Is.EqualTo(1));
         Assert.That(command.Rows, Is.EqualTo(1));
 
         command = batch.BatchCommands[3];
+        Assert.That(command.StatementType, Is.EqualTo(StatementType.Merge));
         Assert.That(command.RecordsAffected, Is.EqualTo(1));
         Assert.That(command.Rows, Is.EqualTo(1));
 
         command = batch.BatchCommands[4];
+        Assert.That(command.StatementType, Is.EqualTo(StatementType.Merge));
         Assert.That(command.RecordsAffected, Is.EqualTo(0));
         Assert.That(command.Rows, Is.EqualTo(0));
     }
 
     [Test]
-    public async Task NpgsqlBatchCommand_StatementType()
+    public async Task StatementTypes()
     {
         await using var conn = await OpenConnectionAsync();
         await using var _ = await CreateTempTable(conn, "name TEXT", out var table);
-        var sproc = await GetTempProcedureName(conn);
 
+        var sproc = await GetTempProcedureName(conn);
         await conn.ExecuteNonQueryAsync(@$"CREATE PROCEDURE {sproc}() LANGUAGE sql AS ''");
 
         await using var batch = new NpgsqlBatch(conn)
@@ -201,14 +206,10 @@ public async Task NpgsqlBatchCommand_StatementType()
                 new("BEGIN"),
                 new($"SELECT name FROM {table}"),
                 new($"DELETE FROM {table}"),
-                new($"CALL {sproc}()"),
                 new("COMMIT")
             }
         };
 
-        if (conn.PostgreSqlVersion.IsGreaterOrEqual(15))
-            batch.BatchCommands.Add(new($"MERGE INTO {table} S USING (SELECT 'b' as name) T ON T.name = S.name WHEN NOT MATCHED THEN DO NOTHING"));
-
         await using var reader = await batch.ExecuteReaderAsync(Behavior);
 
         // Consume SELECT result set to parse the CommandComplete
@@ -220,11 +221,50 @@ public async Task NpgsqlBatchCommand_StatementType()
         Assert.That(batch.BatchCommands[3].StatementType, Is.EqualTo(StatementType.Other));
         Assert.That(batch.BatchCommands[4].StatementType, Is.EqualTo(StatementType.Select));
         Assert.That(batch.BatchCommands[5].StatementType, Is.EqualTo(StatementType.Delete));
-        Assert.That(batch.BatchCommands[6].StatementType, Is.EqualTo(StatementType.Call));
-        Assert.That(batch.BatchCommands[7].StatementType, Is.EqualTo(StatementType.Other));
+        Assert.That(batch.BatchCommands[6].StatementType, Is.EqualTo(StatementType.Other));
+    }
+
+    [Test]
+    public async Task StatementType_Call()
+    {
+        await using var conn = await OpenConnectionAsync();
+        MinimumPgVersion(conn, "11.0", "Stored procedures are supported starting with PG 11");
+
+        var sproc = await GetTempProcedureName(conn);
+        await conn.ExecuteNonQueryAsync($"CREATE PROCEDURE {sproc}() LANGUAGE sql AS ''");
+
+        await using var batch = new NpgsqlBatch(conn)
+        {
+            BatchCommands = { new($"CALL {sproc}()") }
+        };
+
+        await using var reader = await batch.ExecuteReaderAsync(Behavior);
+
+        // Consume SELECT result set to parse the CommandComplete
+        await reader.CloseAsync();
+
+        Assert.That(batch.BatchCommands[0].StatementType, Is.EqualTo(StatementType.Call));
+    }
+
+    [Test]
+    public async Task StatementType_Merge()
+    {
+        await using var conn = await OpenConnectionAsync();
+        MinimumPgVersion(conn, "15.0", "Stored procedures are supported starting with PG 11");
+
+        await using var _ = await CreateTempTable(conn, "name TEXT", out var table);
+
+        await using var batch = new NpgsqlBatch(conn)
+        {
+            BatchCommands = { new($"MERGE INTO {table} S USING (SELECT 'b' as name) T ON T.name = S.name WHEN NOT MATCHED THEN DO NOTHING") }
+        };
+
+        await using var reader = await batch.ExecuteReaderAsync(Behavior);
+
+        // Consume SELECT result set to parse the CommandComplete
+        await reader.CloseAsync();
 
-        if (conn.PostgreSqlVersion.IsGreaterOrEqual(15))
-            Assert.That(batch.BatchCommands[8].StatementType, Is.EqualTo(StatementType.Merge));
+        Assert.That(batch.BatchCommands[0].StatementType, Is.EqualTo(StatementType.Merge));
     }
 
     [Test]
