Changeset 7469

Timestamp:

Apr 3, 2018, 8:57:08 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Merge patch release 3.12.1 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java (copied) (copied from tags/3.12.1/src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java)
• src/test/TestAnnotationFlatFileImporter.java (modified) (2 diffs)

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

@@ -47 +47 @@
 import net.sf.basedb.core.hibernate.TypeWrapper;
 import net.sf.basedb.core.hibernate.MultiUpdateWork;
+import net.sf.basedb.core.hibernate.NativeQueryWrapper;
 import net.sf.basedb.core.hibernate.NativeSQLFunction;
 import net.sf.basedb.core.hibernate.TableExistsWork;
@@ -1912 +1913 @@
       NativeQuery<?> q = session.createNativeQuery(sql);
       ((Query<?>)q).setFetchSize(getJdbcFetchSize());
-      return q;
+      return new NativeQueryWrapper<>(q);
     }
     catch (HibernateException ex)
@@ -1945 +1946 @@
       }
       ((Query<R>)q).setFetchSize(getJdbcFetchSize());
-      return q;
+      return new NativeQueryWrapper<>(q);
     }
     catch (HibernateException ex)
@@ -1966 +1967 @@
       NativeQuery<?> q = session.createNativeQuery(sql);
       ((Query<?>)q).setFetchSize(getJdbcFetchSize());
-      return q;
+      return new NativeQueryWrapper<>(q);
     }
     catch (HibernateException ex)
@@ -1999 +2000 @@
       }
       ((Query<R>)q).setFetchSize(getJdbcFetchSize());
-      return q;
+      return new NativeQueryWrapper<>(q);
     }
     catch (HibernateException ex)

trunk/src/test/TestAnnotationFlatFileImporter.java

@@ -89 +89 @@
     ok &= TestJob.test_execute(jobId, false);
     
+    // One more time to check if update is possible (due to Hibernate bug described in #2110)
+    int jobId2 = test_create_job(pluginDefinitionId, fileId, timeId, ageId, enumId, timestampId, commentId, commentId);
+    ok &= TestJob.test_execute(jobId2, false);
+    
     // Test: list the result
     TestAnnotation.test_list_annotations(Item.SAMPLE, sample1, Annotation.Source.PRIMARY, 5);
@@ -101 +105 @@
 
     TestJob.test_delete(jobId);
+    TestJob.test_delete(jobId2);
     TestFile.test_delete(fileId);
     TestSample.test_delete(sample1);