Changeset 7469


Ignore:
Timestamp:
Apr 3, 2018, 8:57:08 AM (4 years ago)
Author:
Nicklas Nordborg
Message:

Merge patch release 3.12.1 to the trunk.

Location:
trunk
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

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

    r7461 r7469  
    4747import net.sf.basedb.core.hibernate.TypeWrapper;
    4848import net.sf.basedb.core.hibernate.MultiUpdateWork;
     49import net.sf.basedb.core.hibernate.NativeQueryWrapper;
    4950import net.sf.basedb.core.hibernate.NativeSQLFunction;
    5051import net.sf.basedb.core.hibernate.TableExistsWork;
     
    19121913      NativeQuery<?> q = session.createNativeQuery(sql);
    19131914      ((Query<?>)q).setFetchSize(getJdbcFetchSize());
    1914       return q;
     1915      return new NativeQueryWrapper<>(q);
    19151916    }
    19161917    catch (HibernateException ex)
     
    19451946      }
    19461947      ((Query<R>)q).setFetchSize(getJdbcFetchSize());
    1947       return q;
     1948      return new NativeQueryWrapper<>(q);
    19481949    }
    19491950    catch (HibernateException ex)
     
    19661967      NativeQuery<?> q = session.createNativeQuery(sql);
    19671968      ((Query<?>)q).setFetchSize(getJdbcFetchSize());
    1968       return q;
     1969      return new NativeQueryWrapper<>(q);
    19691970    }
    19701971    catch (HibernateException ex)
     
    19992000      }
    20002001      ((Query<R>)q).setFetchSize(getJdbcFetchSize());
    2001       return q;
     2002      return new NativeQueryWrapper<>(q);
    20022003    }
    20032004    catch (HibernateException ex)
  • trunk/src/test/TestAnnotationFlatFileImporter.java

    r6921 r7469  
    8989    ok &= TestJob.test_execute(jobId, false);
    9090   
     91    // One more time to check if update is possible (due to Hibernate bug described in #2110)
     92    int jobId2 = test_create_job(pluginDefinitionId, fileId, timeId, ageId, enumId, timestampId, commentId, commentId);
     93    ok &= TestJob.test_execute(jobId2, false);
     94   
    9195    // Test: list the result
    9296    TestAnnotation.test_list_annotations(Item.SAMPLE, sample1, Annotation.Source.PRIMARY, 5);
     
    101105
    102106    TestJob.test_delete(jobId);
     107    TestJob.test_delete(jobId2);
    103108    TestFile.test_delete(fileId);
    104109    TestSample.test_delete(sample1);
Note: See TracChangeset for help on using the changeset viewer.