fix for the WHERE conditions containing OR in loading rules

InseeFr · Aug 7, 2023 · 7e2bb17 · 7e2bb17
1 parent 5c996f3
commit 7e2bb17
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/arc-core/src/main/java/fr/insee/arc/core/service/engine/chargeur/ChargeurCSV.java b/arc-core/src/main/java/fr/insee/arc/core/service/engine/chargeur/ChargeurCSV.java
@@ -267,8 +267,7 @@ private void applyFormat() throws ArcException {
 							joinTable.get(i).contains(".") ? joinTable.get(i) : this.env + "." + joinTable.get(i));
 
 					// récupération des colonnes de la table
-					List<String> colsIn = new ArrayList<String>();
-					colsIn = UtilitaireDao.get(0)
+					List<String> colsIn = UtilitaireDao.get(0)
 							.executeRequest(this.connexion,
 									new ArcPreparedStatementBuilder(
 											"select " + joinSelect.get(i) + " from " + joinTable.get(i) + " limit 0"))
@@ -346,7 +345,7 @@ private void applyFormat() throws ArcException {
 				req.append("\n FROM " + this.tableTempA + " u ) v ) w ");
 				req.append("\n WHERE false ");
 				for (String s : wheres) {
-					req.append("\n AND " + s);
+					req.append("\n AND (" + s + ")");
 				}
 				req.append(";");
 				UtilitaireDao.get(0).executeImmediate(connexion, req);
@@ -408,7 +407,7 @@ private void applyFormat() throws ArcException {
 					req.append("\n ) v ) w ");
 					req.append("\n WHERE true ");
 					for (String s : wheres) {
-						req.append("\n AND " + s);
+						req.append("\n AND (" + s +")");
 					}
 					req.append(";");
 					UtilitaireDao.get(0).executeImmediate(connexion, req);