Mercurial > lada > lada-server
comparison src/main/java/de/intevation/lada/util/data/DataTransaction.java @ 1100:7683c4162746
Updated importer.
* Fixed in grammar
* More reporting
* Fixed unit test
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 24 Oct 2016 11:52:17 +0200 |
| parents | 186d602e031a |
| children | 14876c62f692 |
comparison
equal
deleted
inserted
replaced
| 1099:46df70a27767 | 1100:7683c4162746 |
|---|---|
| 89 { | 89 { |
| 90 EntityManager em = emp.entityManager(dataSource); | 90 EntityManager em = emp.entityManager(dataSource); |
| 91 em.remove( | 91 em.remove( |
| 92 em.contains(object) ? | 92 em.contains(object) ? |
| 93 object : em.merge(object)); | 93 object : em.merge(object)); |
| 94 em.flush(); | |
| 94 } | 95 } |
| 95 | 96 |
| 96 public Query queryFromString(String sql, String dataSource) { | 97 public Query queryFromString(String sql, String dataSource) { |
| 97 EntityManager em = emp.entityManager(dataSource); | 98 EntityManager em = emp.entityManager(dataSource); |
| 98 return em.createNativeQuery(sql); | 99 return em.createNativeQuery(sql); |