Changeset 7134

Timestamp:

Apr 21, 2016, 2:21:55 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2000: Batch API for annotation handling

Fixes a major bug where the annotation batcher executed the SQL for INSERT before DELETE causing newly inserted annotation values to be deleted immediately. This affected the case when updating an existing annotation since this is the only case where both the delete and insert statements are used.

File:

• trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java

@@ -284 +284 @@
         String valuesTableName = t.getTableName();
 
+        // IMPORTANT! The DELETE must be before the INSERT or the 
+        // batecher will insert new values before deleting old (and also delete the new)
+        this.deleteValues[t.ordinal()] = createUpdateBatcher(c, 
+          PredefinedQuery.getQueryString("AB_DELETE_FROM_VALUES", valuesTableName), 
+          Types.INTEGER /* ParameterValue.id */
+          );
+        
         this.insertValues[t.ordinal()] = createUpdateBatcher(c, 
           PredefinedQuery.getQueryString("AB_INSERT_INTO_VALUES", valuesTableName), 
           Types.INTEGER, /* ParameterValue.id */ 
           t.getSQLType() /* value */
-          );
-
-        this.deleteValues[t.ordinal()] = createUpdateBatcher(c, 
-          PredefinedQuery.getQueryString("AB_DELETE_FROM_VALUES", valuesTableName), 
-          Types.INTEGER /* ParameterValue.id */
           );
       }