diff backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java @ 8641:c851d1ea543a

SCHEMA CHANGE: Remove unnecessary direct relation of sq_relation with rivers.
author Tom Gottfried <tom@intevation.de>
date Fri, 27 Mar 2015 17:42:27 +0100
parents 4c3ccf2b0304
children 67e53dbe05d2
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java	Fri Mar 27 17:27:08 2015 +0100
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSQRelation.java	Fri Mar 27 17:42:27 2015 +0100
@@ -18,7 +18,6 @@
 import org.hibernate.Session;
 import org.hibernate.exception.ConstraintViolationException;
 
-import org.dive4elements.river.model.River;
 import org.dive4elements.river.model.SQRelation;
 import org.dive4elements.river.model.TimeInterval;
 
@@ -39,10 +38,10 @@
         this.values = new ArrayList<ImportSQRelationValue>();
     }
 
-    public void storeDependencies(River river) {
+    public void storeDependencies() {
         log.info("store dependencies");
 
-        SQRelation peer = getPeer(river);
+        SQRelation peer = getPeer();
 
         if (peer != null) {
             int count = 0;
@@ -64,7 +63,7 @@
         }
     }
 
-    public SQRelation getPeer(River river) {
+    public SQRelation getPeer() {
         log.debug("getPeer()");
 
         if (peer == null) {
@@ -78,10 +77,12 @@
             Session session = ImporterSession.getInstance()
                 .getDatabaseSession();
 
-            Query query = session
-                .createQuery("FROM SQRelation WHERE river=:river AND timeInterval=:timeInter");
+            Query query = session.createQuery(
+                "from SQRelation where " +
+                "    description = :description and " +
+                "    timeInterval=:timeInter");
 
-            query.setParameter("river", river);
+            query.setParameter("description", description);
             query.setParameter("timeInter", timeInter);
 
             List<SQRelation> sq = query.list();
@@ -89,7 +90,7 @@
             if (sq.isEmpty()) {
                 log.info("create new SQ relation '" + description + "'");
 
-                peer = new SQRelation(river, timeInter, description);
+                peer = new SQRelation(timeInter, description);
                 session.save(peer);
             }
             else {

http://dive4elements.wald.intevation.org