From 448879958c2a09f1c4253aa1b2e7cb5fe568d8de Mon Sep 17 00:00:00 2001
From: Olougouna Axel <olougoun@insa-20157>
Date: Fri, 16 Dec 2022 09:17:00 +0100
Subject: [PATCH 1/3] question 13 tested

---
 request.sql | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/request.sql b/request.sql
index e57adf4..b779d1e 100644
--- a/request.sql
+++ b/request.sql
@@ -1,7 +1,7 @@
 
 --         | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
--- Axel    |   |   | O | O |   |   |   |   |   |    |    | x  |    |    |    |    |    |    |    |    |    |
+-- Axel    |   |   | O | O |   |   |   |   |   |    |    | x  | O  |    |    |    |    |    |    |    |    |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
 -- Ronan   |   | O |   |   |   | O |   |   |   | x  |    |    |    |    |    | x  |    |    |    |    |    |
 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
@@ -137,14 +137,14 @@ WHERE pub.classeConf = 'A' AND pub.classeConf NOT IN ('A*', 'B', 'C');
 --RIGHT JOIN Publication pub ON pub.idPublication = ps.idScientifique
 --WHERE pub.classeConf IN  'A*', 'A', 'B', 'C';
 
--- Axel Q13
-SELECT p.idScientifique, p.nom, p.prenom FROM Personnel p
+-- Axel Q13 tested
+SELECT DISTINCT p.idPersonnel, p.nom, p.prenom FROM Personnel p
 JOIN Enseignant_Chercheur ec ON ec.idEnseignant = p.idPersonnel
-RIGHT JOIN Encadrement encad1 on encad1.idEnseignant = ec.idEnseignant
+RIGHT JOIN Encadrement encad1 ON ec.idEnseignant = encad1.idScientifique
 WHERE ec.idEnseignant = encad1.idScientifique
 AND NOT EXISTS (SELECT * FROM Doctorant doc
                 WHERE NOT EXISTS(SELECT * FROM Encadrement encad2
-                                WHERE encad2.idScientifique = ec.idScientifique
+                                WHERE encad2.idScientifique = ec.idEnseignant
                                         AND encad2.idDoctorant = doc.idDoctorant));
 
 -- Yasmine QUESTION 14 Testé

From 401e6ce57ef1606a8c16c8e74d7ad7cda57c3ba7 Mon Sep 17 00:00:00 2001
From: Yasmine Grane-Belghmaidi <granebel@noreply.etud.insa-toulouse.fr>
Date: Fri, 16 Dec 2022 09:36:25 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Mettre=20=C3=A0=20jour=20'insert.sql'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 insert.sql | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/insert.sql b/insert.sql
index c567578..5bff8c1 100644
--- a/insert.sql
+++ b/insert.sql
@@ -181,6 +181,20 @@ INSERT INTO Enseignant_Chercheur VALUES (
     '5'
 );
 
+INSERT INTO Enseignant_Chercheur VALUES (
+    7,
+    1,
+    '5'
+);
+
+INSERT INTO Enseignant_Chercheur VALUES (
+    7,
+    1,
+    '5'
+);
+
+
+
 ----------------------------------------------------------------------
 --                                                                  --
 --                    Evenement                                     --
@@ -510,6 +524,7 @@ INSERT INTO Publie_Externe VALUES (
     5
 );
 
+
 ----------------------------------------------------------------------
 --                                                                  --
 --                    Partenaire                                    --
@@ -552,6 +567,10 @@ INSERT INTO Partenaire(nom, pays) VALUES (
 --                                                                  --
 ----------------------------------------------------------------------
 
+
+
+
+
 ----------------------------------------------------------------------
 --                                                                  --
 --                    Organise                                      --
@@ -579,3 +598,16 @@ INSERT INTO Encadrement VALUES (
     8,
     2
 );
+
+----------------------------------------------------------------------
+--                                                                  --
+--                    Publie doctorant                             --
+--                                                                  --
+----------------------------------------------------------------------
+
+INSERT INTO  publie_doctorant VALUES (
+    8,
+    2
+);
+
+

From b119cf9702250b937e1c924da94fb625026da004 Mon Sep 17 00:00:00 2001
From: Yasmine Grane-Belghmaidi <granebel@noreply.etud.insa-toulouse.fr>
Date: Fri, 16 Dec 2022 09:38:24 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Mettre=20=C3=A0=20jour=20'request.sql'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 request.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/request.sql b/request.sql
index 60e9c92..f2bd827 100644
--- a/request.sql
+++ b/request.sql
@@ -191,7 +191,7 @@ WHERE idScientifique IN (
 SELECT idEtablissement, Count(Distinct idEnseignant)
 FROM Enseignant_chercheur
 GROUP BY idEtablissement
-HAVING count(Distinct idEnseignant) >= 50;
+HAVING count(Distinct idEnseignant) >= 2;
 
 
 --Yasmine QUESTION 21 Testé