Fix for #7186 - it is now possible to continue using the SQLContainer after an OptimisticLockException after first doing a rollback()

svn changeset:20844/svn branch:6.7

2 files changed, 48 insertions, 5 deletions

diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
index f985fa2ad9..5191fcc341 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
@@ -19,12 +19,11 @@ import com.vaadin.tests.server.container.sqlcontainer.query.TableQueryTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({ SimpleJDBCConnectionPoolTest.class,
-        J2EEConnectionPoolTest.class, LikeTest.class,
-        QueryBuilderTest.class, FreeformQueryTest.class,
-        RowIdTest.class, SQLContainerTest.class,
+        J2EEConnectionPoolTest.class, LikeTest.class, QueryBuilderTest.class,
+        FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class,
         SQLContainerTableQueryTest.class, ColumnPropertyTest.class,
         TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class,
-        TicketTests.class, BetweenTest.class, ReadOnlyRowIdTest.class})
+        TicketTests.class, BetweenTest.class, ReadOnlyRowIdTest.class })
 public class AllTests {
     /* Set the DB used for testing here! */
     public enum DB {
@@ -83,7 +82,7 @@ public class AllTests {
             versionStatements = new String[] {
                     "create table VERSIONED (ID integer auto_increment not null, TEXT varchar(255), VERSION tinyint default 0, primary key(ID))",
                     "CREATE TRIGGER upd_version BEFORE UPDATE ON VERSIONED"
-                            + " FOR EACH ROW SET NEW.VERSION = @VERSION+1" };
+                            + " FOR EACH ROW SET NEW.VERSION = OLD.VERSION+1" };
             break;
         case POSTGRESQL:
             offset = 1;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
index a3b2b20ffe..d6f5ce1cbc 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
@@ -616,4 +616,48 @@ public class TableQueryTest {
         container.commit();

     }

 

+    @Test

+    public void removeRow_throwsOptimisticLockException_shouldStillWork()

+            throws SQLException {

+        if (AllTests.db == AllTests.DB.HSQLDB) {

+            // HSQLDB doesn't support versioning, so this is to make the test

+            // green.

+            return;

+        }

+        DataGenerator.addVersionedData(connectionPool);

+

+        TableQuery tQuery = new TableQuery("versioned", connectionPool,

+                AllTests.sqlGen);

+        tQuery.setVersionColumn("VERSION");

+        SQLContainer container = new SQLContainer(tQuery);

+        RowItem row = (RowItem) container.getItem(container.firstItemId());

+        Assert.assertEquals("Junk", row.getItemProperty("TEXT").getValue());

+

+        // Update the version using another connection.

+        Connection conn = connectionPool.reserveConnection();

+        PreparedStatement stmt = conn

+                .prepareStatement("UPDATE VERSIONED SET \"TEXT\" = ? WHERE \"ID\" = ?");

+        stmt.setString(1, "asdf");

+        stmt.setObject(2, row.getItemProperty("ID").getValue());

+        stmt.executeUpdate();

+        stmt.close();

+        conn.commit();

+        connectionPool.releaseConnection(conn);

+

+        Object itemToRemove = container.firstItemId();

+        try {

+            container.removeItem(itemToRemove);

+            container.commit();

+        } catch (OptimisticLockException e) {

+            // This is expected, refresh and try again.

+            container.rollback();

+            container.removeItem(itemToRemove);

+            container.commit();

+        }

+        Object id = container.addItem();

+        RowItem item = (RowItem) container.getItem(id);

+        item.getItemProperty("TEXT").setValue("foo");

+        container.commit();

+    }

+

 }
\ No newline at end of file