From 099a505d5fd8adbcfa9c639aa5a2f82ce8837918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Mon, 3 Feb 2020 15:50:06 +0100
Subject: [PATCH] Correction de bug :le workflow plantait qd on lui envoyait du
SQL sous forme de varchar et non de params
---
data/ddl.php | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/data/ddl.php b/data/ddl.php
index 5e6f7b2669..1a46c2306f 100644
--- a/data/ddl.php
+++ b/data/ddl.php
@@ -28659,12 +28659,19 @@ END OSE_WORKFLOW;',
intervenant := \'
SELECT
- id intervenant_id,
- annee_id annee_id,
- statut_id statut_intervenant_id,
- premier_recrutement premier_recrutement
+ *
FROM
- intervenant
+ (
+ SELECT
+ id intervenant_id,
+ annee_id annee_id,
+ statut_id statut_intervenant_id,
+ premier_recrutement premier_recrutement
+ FROM
+ intervenant
+ )
+ WHERE
+ \' || p || \'
\';
@@ -28931,8 +28938,7 @@ END OSE_WORKFLOW;',
UNION ALL \' || contrat || \'
) w ON w.intervenant_id = i.intervenant_id AND w.etape_code = e.code
WHERE
- \' || unicaen_tbl.params_to_conds(params,\'i\') || \'
- AND (e.obligatoire = 1 OR w.intervenant_id IS NOT NULL)
+ e.obligatoire = 1 OR w.intervenant_id IS NOT NULL
\';
END;
--
GitLab