Added extra test case for multiple updates

h2/src/main/org/h2/command/dml/MergeUsing.java

@@ -106,7 +106,7 @@ public class MergeUsing extends Merge {
                 }
             }
             if(sourceKeysRemembered.containsKey(sourceKeyValuesList)){
-                throw DbException.get(ErrorCode.DUPLICATE_KEY_1, "Merge using ON column expression, duplicates values found:keys"
+                throw DbException.get(ErrorCode.DUPLICATE_KEY_1, "Merge using ON column expression, duplicate values found:keys"
                         +Arrays.asList(sourceKeys).toString()+":values:"+sourceKeyValuesList.toString()
                         +":from:"+sourceTableFilter.getTable()+":alias:"+sourceTableFilter.getTableAlias()+":current row number:"+countInputRows
                         +":conflicting row number:"+sourceKeysRemembered.get(sourceKeyValuesList));
@@ -167,27 +167,27 @@ public class MergeUsing extends Merge {
         sourceTableFilter.set(sourceRow);
 
         // try and perform an update
-        int count = 0;
+        int rowUpdateCount = 0;
         System.out.println("onConditions="+onCondition.toString());
         if(updateCommand!=null){
             System.out.println("updatePlanSQL="+updateCommand.getPlanSQL());
-            count += updateCommand.update();
-            System.out.println("update.count="+count);
+            rowUpdateCount += updateCommand.update();
+            System.out.println("update.count="+rowUpdateCount);
         }
-        if(deleteCommand!=null && count==0){
+        if(deleteCommand!=null && rowUpdateCount==0){
             System.out.println("deleteCommand="+deleteCommand.getPlanSQL());
-            count += deleteCommand.update();
-            System.out.println("delete.count="+count);
+            rowUpdateCount += deleteCommand.update();
+            System.out.println("delete.count="+rowUpdateCount);
         }
         
         // if either updates do nothing, try an insert
-        if (count == 0) {
-            count+=addRowByCommandInsert(session,newTargetRow);
+        if (rowUpdateCount == 0) {
+            rowUpdateCount+=addRowByCommandInsert(session,newTargetRow);
             //addRowByAPIInsert(session,newTargetRow);
-        } else if (count != 1) {
-            throw DbException.get(ErrorCode.DUPLICATE_KEY_1, targetTable.getSQL());
+        } else if (rowUpdateCount != 1) {
+            throw DbException.get(ErrorCode.DUPLICATE_KEY_1, "Duplicate key updated "+rowUpdateCount+" rows at once, only 1 expected:"+targetTable.getSQL());
         }
-        countUpdatedRows+=count;
+        countUpdatedRows+=rowUpdateCount;
     }
 
 

h2/src/test/org/h2/test/db/TestMergeUsing.java

@@ -123,7 +123,18 @@ public class TestMergeUsing extends TestBase {
                 GATHER_ORDERED_RESULTS_SQL,
                 "SELECT 1 AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(1,1)",
                 3,
-                "Unique index or primary key violation: \"Merge using ON column expression, duplicates values found:keys[ID]:values:[1]:from:PUBLIC.SOURCE:alias:SOURCE:current row number:2:conflicting row number:1"
+                "Unique index or primary key violation: \"Merge using ON column expression, duplicate values found:keys[ID]:values:[1]:from:PUBLIC.SOURCE:alias:SOURCE:current row number:2:conflicting row number:1"
+                );
+        
+        // Duplicate key updated 3 rows at once, only 1 expected
+        testMergeUsingException(
+                "CREATE TABLE PARENT AS (SELECT 1 AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3) );"+
+                        "CREATE TABLE SOURCE AS (SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(1,3)  );",
+                "MERGE INTO PARENT USING SOURCE ON (PARENT.ID = SOURCE.ID) WHEN MATCHED THEN UPDATE SET PARENT.NAME = SOURCE.NAME||SOURCE.ID WHERE PARENT.ID = 2 DELETE WHERE PARENT.ID = 1 WHEN NOT MATCHED THEN INSERT (ID, NAME) VALUES (SOURCE.ID, SOURCE.NAME)",
+                GATHER_ORDERED_RESULTS_SQL,
+                "SELECT X AS ID, 'Marcy'||X||X AS NAME FROM SYSTEM_RANGE(2,2) UNION ALL SELECT X AS ID, 'Marcy'||X AS NAME FROM SYSTEM_RANGE(3,3)",
+                3,
+                "Duplicate key updated 3 rows at once, only 1 expected"
                 );        
         }
 
@@ -145,6 +156,7 @@ public class TestMergeUsing extends TestBase {
         ResultSet rs;
         int rowCountUpdate;
 
+        try{
             stat = conn.createStatement();
             stat.execute(setupSQL);
     
@@ -167,9 +179,12 @@ public class TestMergeUsing extends TestBase {
             }
             assertEquals("Differences between expected and actual output found:"+diffBuffer,0,rowCount);
             assertEquals("Expected update counts differ",expectedRowUpdateCount,rowCountUpdate);
+        }
+        finally{
             conn.close();
             deleteDb("mergeUsingQueries");
         }
+    }
     /**
      * Run a test case of the merge using syntax
      * @param setupSQL - one or more SQL statements to setup the case