From c7492f86c7f4e150923ca1ed8928cf7c77619efb Mon Sep 17 00:00:00 2001 From: nbillard Date: Fri, 16 Dec 2022 09:44:51 +0100 Subject: [PATCH 1/8] git error fixed --- insert.sql | 2 -- request.sql | 1 - 2 files changed, 3 deletions(-) diff --git a/insert.sql b/insert.sql index 4202127..2fa359e 100644 --- a/insert.sql +++ b/insert.sql @@ -554,8 +554,6 @@ INSERT INTO Enseignant_Chercheur VALUES ( ); ->>>>>>> b119cf9702250b937e1c924da94fb625026da004 - ---------------------------------------------------------------------- -- -- -- Evenement -- diff --git a/request.sql b/request.sql index f2bd827..8468dfb 100644 --- a/request.sql +++ b/request.sql @@ -5,7 +5,6 @@ -- Axel | | | O | O | | | | | | | | x | O | | | | | | | | | ======= -- Axel | | | O | O | | | | | | | | x | x | | | | | | | | | ->>>>>>> 1a38bf8865af3e2e64d57867ce98f7f521a5b0a3 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | | -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ From 705f541df7af00e93e991be2944033daf18b7d52 Mon Sep 17 00:00:00 2001 From: nbillard Date: Fri, 16 Dec 2022 09:48:43 +0100 Subject: [PATCH 2/8] fixed id errors --- insert.sql | 120 ++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/insert.sql b/insert.sql index 2fa359e..86211d6 100644 --- a/insert.sql +++ b/insert.sql @@ -397,66 +397,6 @@ INSERT INTO Enseignant_Chercheur VALUES ( '5' ); -INSERT INTO Enseignant_Chercheur VALUES ( - 1, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 2, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 3, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 4, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 5, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 6, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 7, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 8, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 9, - 3, - '7' -); - -INSERT INTO Enseignant_Chercheur VALUES ( - 10, - 3, - '7' -); - INSERT INTO Enseignant_Chercheur VALUES ( 11, 3, @@ -553,6 +493,66 @@ INSERT INTO Enseignant_Chercheur VALUES ( '7' ); +INSERT INTO Enseignant_Chercheur VALUES ( + 27, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 28, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 29, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 30, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 31, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 32, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 33, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 34, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 35, + 3, + '7' +); + +INSERT INTO Enseignant_Chercheur VALUES ( + 36, + 3, + '7' +); + ---------------------------------------------------------------------- -- -- From 46f3d489ccc736242d93b1dfe71ccf307b7d0c16 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 16 Dec 2022 09:49:35 +0100 Subject: [PATCH 3/8] =?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 7f8c797..9a938b0 100644 --- a/request.sql +++ b/request.sql @@ -187,7 +187,7 @@ WHERE idScientifique IN ( SELECT idEtablissement, Count(Distinct idEnseignant) FROM Enseignant_chercheur GROUP BY idEtablissement -HAVING count(Distinct idEnseignant) >= 2; +HAVING count(Distinct idEnseignant) >= 50; --Yasmine QUESTION 21 Testé From a116a06de6aee8abffd5098ef1e563119bfc85e2 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 16 Dec 2022 10:06:32 +0100 Subject: [PATCH 4/8] =?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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/insert.sql b/insert.sql index 86211d6..55f5046 100644 --- a/insert.sql +++ b/insert.sql @@ -732,6 +732,7 @@ INSERT INTO Publication(titre, annee, nomConf, classeConf, nbPages) VALUES( --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( + 4 'BaseDeDonnee', 'BDD', DATE '2022-12-07', @@ -744,6 +745,7 @@ INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( + 5 'langC', 'C', DATE '2022-11-07', @@ -756,6 +758,7 @@ INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( + 6 'Programation web', 'ProgWeb', DATE '2022-04-07', @@ -883,6 +886,27 @@ INSERT INTO Publie_Externe VALUES ( 5 ); +---------------------------------------------------------------------- +-- -- +-- Participe Externe -- +-- -- +---------------------------------------------------------------------- +INSERT INTO participe_externe VALUES ( + 4, + 5 +); + +INSERT INTO participe_externe VALUES ( + 5, + 5 +); + +INSERT INTO participe_externe VALUES ( + 6, + 5 +); + + ---------------------------------------------------------------------- -- -- @@ -892,30 +916,35 @@ INSERT INTO Publie_Externe VALUES ( --Axel INSERT INTO Partenaire(nom, pays) VALUES ( + 5 'GFGH', 'Allemagne' ); --Axel INSERT INTO Partenaire(nom, pays) VALUES ( + 6 'LMC', 'Australie' ); --Axel INSERT INTO Partenaire(nom, pays) VALUES ( + 7 'ESHT', 'USA' ); --Axel INSERT INTO Partenaire(nom, pays) VALUES ( + 8 'HLMY', 'Japon' ); --Axel INSERT INTO Partenaire(nom, pays) VALUES ( + 9 'MAKL', 'France' ); From 571aff5e4bc9a94a0050b76b44da55f0a969af65 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Thu, 5 Jan 2023 08:36:38 +0100 Subject: [PATCH 5/8] =?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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/insert.sql b/insert.sql index 55f5046..92416b1 100644 --- a/insert.sql +++ b/insert.sql @@ -769,6 +769,9 @@ INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, 5 ); + + + ---------------------------------------------------------------------- -- -- -- Participe -- From e17841d28435cb36a85cb084042fa5596d9d07ba Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Thu, 5 Jan 2023 08:42:50 +0100 Subject: [PATCH 6/8] =?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 9a938b0..061e554 100644 --- a/request.sql +++ b/request.sql @@ -182,7 +182,7 @@ WHERE idScientifique IN ( ); --- Yasmine QUESTION 19 Testé +-- Yasmine QUESTION 19 Testé AVEC 25 AU LIEU DE 50 SELECT idEtablissement, Count(Distinct idEnseignant) FROM Enseignant_chercheur From 048edb8f239ceb3732eaf609d170c09826a7fa98 Mon Sep 17 00:00:00 2001 From: nbillard Date: Thu, 5 Jan 2023 09:09:53 +0100 Subject: [PATCH 7/8] question 18 done and dusted --- insert.sql | 18 +++++++++++++++--- request.sql | 27 ++++++++++++++++++--------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/insert.sql b/insert.sql index 55f5046..ff74d10 100644 --- a/insert.sql +++ b/insert.sql @@ -732,7 +732,6 @@ INSERT INTO Publication(titre, annee, nomConf, classeConf, nbPages) VALUES( --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( - 4 'BaseDeDonnee', 'BDD', DATE '2022-12-07', @@ -745,7 +744,6 @@ INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( - 5 'langC', 'C', DATE '2022-11-07', @@ -758,7 +756,6 @@ INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, --Yasmine INSERT INTO Projet(titre, acronyme, annee_debut, annee_fin, duree, budget_Laas, cout, idMeneurProjet) VALUES( - 6 'Programation web', 'ProgWeb', DATE '2022-04-07', @@ -780,6 +777,21 @@ INSERT INTO Participe VALUES ( 5 ); +INSERT INTO Participe VALUES ( + 1, + 2 +); + +INSERT INTO Participe VALUES ( + 2, + 2 +); + +INSERT INTO Participe VALUES ( + 3, + 2 +); + ---------------------------------------------------------------------- -- -- -- Preside -- diff --git a/request.sql b/request.sql index 9a938b0..2b4f27a 100644 --- a/request.sql +++ b/request.sql @@ -7,7 +7,7 @@ -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- Yasmine | | | | | O | | | O | | | | | | O | O | | | | O | | O | -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ --- Nathan | O | | | | | | O | | O | | O | | | | | | O | | | | | +-- Nathan | O | | | | | | O | | O | | O | | | | | | O | O | | | | -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- ^ ^ ^ -- | | | @@ -181,6 +181,18 @@ WHERE idScientifique IN ( WHERE nbProjets = 1 ); +-- Nathan QUESTION 18 (celle de Ronan) tested +SELECT * from Scientifique +WHERE idScientifique IN ( + SELECT idScientifique FROM ( + SELECT idScientifique, COUNT(DISTINCT idProjet) AS nbProjets FROM Participe + GROUP BY idScientifique + ) AS ParticipationCount + RIGHT JOIN ( + SELECT COUNT(DISTINCT idProjet) AS nbTotalProjets FROM Projet + ) AS ProjectCount + ON ParticipationCount.nbProjets = ProjectCount.nbTotalProjets +); -- Yasmine QUESTION 19 Testé @@ -196,11 +208,8 @@ SELECT Distinct P.Pays FROM Partenaire P, Participe_externe PEX where P.idpartenaire=PEX.idpartenaire and not exists (Select * - - From Projet PR - Where not exists (Select * - - From Participe_externe PEX2 - Where PEX2.idPartenaire=P.idPartenaire and - PEX2.idProjet=PR.idProjet)); - + From Projet PR + Where not exists (Select * + From Participe_externe PEX2 + Where PEX2.idPartenaire=P.idPartenaire and + PEX2.idProjet=PR.idProjet)); From 2d6364068e164bae6bc595c68e97ebf5c782d1d6 Mon Sep 17 00:00:00 2001 From: nbillard Date: Thu, 5 Jan 2023 09:37:40 +0100 Subject: [PATCH 8/8] rien --- insert.sql | 16 ++++++++++++++++ request.sql | 1 - 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/insert.sql b/insert.sql index 3ec4feb..5d8d514 100644 --- a/insert.sql +++ b/insert.sql @@ -795,6 +795,22 @@ INSERT INTO Participe VALUES ( 2 ); +INSERT INTO Participe VALUES ( + 1, + 7 +); + +INSERT INTO Participe VALUES ( + 2, + 7 +); + +INSERT INTO Participe VALUES ( + 3, + 7 +); + + ---------------------------------------------------------------------- -- -- -- Preside -- diff --git a/request.sql b/request.sql index b8d1965..7c603eb 100644 --- a/request.sql +++ b/request.sql @@ -201,7 +201,6 @@ FROM Enseignant_chercheur GROUP BY idEtablissement HAVING count(Distinct idEnseignant) >= 50; - --Yasmine QUESTION 21 Testé SELECT Distinct P.Pays