Granting a additional right to a role that already had a right for that table was not working.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Spatial index: a few bugs have been fixed (using spatial constraints in views,
+<ul><li>Granting a additional right to a role that already had a right for that table was not working.
+</li><li>Spatial index: a few bugs have been fixed (using spatial constraints in views,
     transfering geometry objects over TCP/IP).
 </li><li>Issue 551: the datatype documentation was incorrect (found by Bernd Eckenfels).
 </li><li>Issue 368: ON DUPLICATE KEY UPDATE did not work for multi-row inserts.

h2/src/main/org/h2/command/ddl/GrantRevoke.java

@@ -115,6 +115,7 @@ public class GrantRevoke extends DefineCommand {
                 db.addDatabaseObject(session, right);
             } else {
                 right.setRightMask(right.getRightMask() | rightMask);
+                db.update(session, right);
             }
         }
     }

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

@@ -35,6 +35,7 @@ public class TestRights extends TestBase {
 
     @Override
     public void test() throws SQLException {
+        testGrantMore();
         testOpenNonAdminWithMode();
         testDisallowedTables();
         testDropOwnUser();
@@ -47,6 +48,26 @@ public class TestRights extends TestBase {
         deleteDb("rights");
     }
     
+    private void testGrantMore() throws SQLException {
+        deleteDb("rights");
+        Connection conn = getConnection("rights");
+        stat = conn.createStatement();
+        stat.execute("create role new_role");
+        stat.execute("create table test(id int)");
+        stat.execute("grant select on test to new_role");
+        ResultSet rs = stat.executeQuery("select * from information_schema.table_privileges");
+        assertTrue(rs.next());
+        assertFalse(rs.next());
+        stat.execute("grant insert on test to new_role");
+        rs = stat.executeQuery("select * from information_schema.table_privileges");
+        assertTrue(rs.next());
+        assertTrue(rs.next());
+        assertFalse(rs.next());
+        stat.execute("drop table test");
+        stat.execute("drop role new_role");
+        conn.close();
+    }
+
     private void testOpenNonAdminWithMode() throws SQLException {
         if (config.memory) {
             return;