From 4f4c6860d874d00a2f3c5597c6e3ef2f44a23ac3 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 9 Dec 2022 11:16:17 +0100 Subject: [PATCH 1/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 26b77ff..0b291c6 100644 --- a/request.sql +++ b/request.sql @@ -66,7 +66,7 @@ GROUP BY idDoctorant; SELECT idEnseignant FROM Enseignant-chercheur NOT IN ( (SELECT idScientifique - FROM Publication) + FROM Publie_scientifique) UNION (SELECT idScientifique FROM Encadrement) From 97cf98c230145ec1d5e193008cbd7896e5f2e443 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 9 Dec 2022 11:23:40 +0100 Subject: [PATCH 2/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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/insert.sql b/insert.sql index 802a75b..7195a2d 100644 --- a/insert.sql +++ b/insert.sql @@ -150,6 +150,8 @@ INSERT INTO Labo_externe ( 'Bresil' ); +--Yasmine + INSERT INTO Projet ( 01, 'BaseDeDonnee', @@ -162,6 +164,8 @@ INSERT INTO Projet ( 001 ); +--Yasmine + INSERT INTO Projet ( 02, 'langC', @@ -209,6 +213,9 @@ INSERT INTO Partenaire( 'MAKL', 'France' ); + +--Yasmine + INSERT INTO Projet ( 03, 'Programation web', @@ -221,6 +228,7 @@ INSERT INTO Projet ( 003 ); +--Yasmine INSERT INTO Publication ( 001, 'recherche scientifique sur la chimie organique', @@ -230,6 +238,8 @@ INSERT INTO Publication ( 220 ); +--Yasmine + INSERT INTO Publication ( 002, 'Page rank', @@ -239,6 +249,8 @@ INSERT INTO Publication ( 220 ); +--Yasmine + INSERT INTO Publication VALUES ( 003, 'chaine de markov', @@ -263,6 +275,7 @@ INSERT INTO Publie_Doctorant VALUES ( 4 ); +--Yasmine INSERT INTO Evenememnt ( 0001, @@ -270,12 +283,16 @@ INSERT INTO Evenememnt ( DATE '2023-07-07' ); +--Yasmine + INSERT INTO Evenememnt ( 0002, DATE '2022-01-07', DATE '2023-07-12' ); +--Yasmine + INSERT INTO Evenememnt VALUES ( 0003, DATE '2022-02-10', From 14a10066e9458e82bf7eed1ee14fb1f747c1c7e8 Mon Sep 17 00:00:00 2001 From: Bonnet Ronan Date: Fri, 9 Dec 2022 11:25:13 +0100 Subject: [PATCH 3/8] insert publie_scientifique --- insert.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/insert.sql b/insert.sql index 802a75b..c966b5d 100644 --- a/insert.sql +++ b/insert.sql @@ -263,6 +263,20 @@ INSERT INTO Publie_Doctorant VALUES ( 4 ); +INSERT INTO Publie_Scientifique VALUES ( + 1, + 3 +); + +INSERT INTO Publie_Scientifique VALUES ( + 2, + 3 +); + +INSERT INTO Publie_Scientifique VALUES ( + 1, + 2 +); INSERT INTO Evenememnt ( 0001, From ff6e96a5a078759c7557288a85c3e33d46d89e40 Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 9 Dec 2022 11:26: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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/insert.sql b/insert.sql index 7195a2d..d5884ec 100644 --- a/insert.sql +++ b/insert.sql @@ -277,7 +277,7 @@ INSERT INTO Publie_Doctorant VALUES ( --Yasmine -INSERT INTO Evenememnt ( +INSERT INTO Evenememnt VALUES ( 0001, DATE '2022-07-07', DATE '2023-07-07' @@ -285,7 +285,7 @@ INSERT INTO Evenememnt ( --Yasmine -INSERT INTO Evenememnt ( +INSERT INTO Evenememnt VALUES ( 0002, DATE '2022-01-07', DATE '2023-07-12' From 5d2f5e1ffedc081a65680c4f9cd7aa0caed91045 Mon Sep 17 00:00:00 2001 From: nbillard Date: Fri, 9 Dec 2022 11:26:38 +0100 Subject: [PATCH 5/8] adding values to insert --- insert.sql | 65 +++++++++++++++++++++++++++++------------------------ request.sql | 20 +++++++++++++++-- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/insert.sql b/insert.sql index 802a75b..28656ed 100644 --- a/insert.sql +++ b/insert.sql @@ -1,4 +1,4 @@ -INSERT INTO Personnel ( +INSERT INTO Personnel VALUES ( 0, 'Billard', 'Nathan', @@ -9,7 +9,7 @@ INSERT INTO Personnel ( --Axel -INSERT INTO Etablissement( +INSERT INTO Etablissement VALUES ( 01, 'Institut National des Sciences Appliquées', 'INSA', @@ -17,7 +17,7 @@ INSERT INTO Etablissement( ); --Axel -INSERT INTO Etablissement( +INSERT INTO Etablissement VALUES ( 02, 'Ecole Nationale de l Aviation Civile', 'ENAC', @@ -26,14 +26,14 @@ INSERT INTO Etablissement( --Axel -INSERT INTO Etablissement( +INSERT INTO Etablissement VALUES ( 03, 'Ecole Polytechnique', 'X', 'Paris' ); -INSERT INTO Personnel ( +INSERT INTO Personnel VALUES ( 1, 'Bonnet', 'Ronan', @@ -42,7 +42,7 @@ INSERT INTO Personnel ( '2020-9-15' ); -INSERT INTO Personnel ( +INSERT INTO Personnel VALUES ( 2, 'Olougouna', 'Axel', @@ -51,7 +51,7 @@ INSERT INTO Personnel ( '2020-9-15' ); -INSERT INTO Personnel ( +INSERT INTO Personnel VALUES ( 3, 'Grane', 'Yasmine', @@ -60,7 +60,7 @@ INSERT INTO Personnel ( '2020-9-15' ); -INSERT INTO Personnel ( +INSERT INTO Personnel VALUES ( 4, 'Wonderland', 'Alice', @@ -77,7 +77,7 @@ INSERT INTO Personnel VALUES ( 'au chantier', '2020-9-15' );--Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 01, 'GFGH', 'Allemagne' @@ -102,40 +102,47 @@ INSERT INTO Scientifique VALUES ( INSERT INTO Scientifique VALUES ( 2, - 'cr1' + 'mcf' ); -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 0, 'LAAS', 'France' ); -INSERT INTO Labo_externe ( +INSERT INTO Encadrement VALUES ( + 4, + 2 +); + +INSERT INTO + +INSERT INTO Labo_externe VALUES ( 1, 'CNES', 'France' ); -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 2, 'GEAS', 'Allemagne' ); -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 3, 'RUAF', 'Russie' ); -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 4, 'ENFD', 'Angleterre' ); -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 5, 'LUBN', 'Luxembourg' @@ -144,13 +151,13 @@ INSERT INTO Labo_externe ( -- Ronan -INSERT INTO Labo_externe ( +INSERT INTO Labo_externe VALUES ( 6, 'BRBN', 'Bresil' ); -INSERT INTO Projet ( +INSERT INTO Projet VALUES ( 01, 'BaseDeDonnee', 'BDD', @@ -162,7 +169,7 @@ INSERT INTO Projet ( 001 ); -INSERT INTO Projet ( +INSERT INTO Projet VALUES ( 02, 'langC', 'C', @@ -176,40 +183,40 @@ INSERT INTO Projet ( --Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 01, 'GFGH', 'Allemagne' ); --Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 02, 'LMC', 'Australie' ); --Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 03, 'ESHT', 'USA' ); --Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 01, 'HLMY', 'Japon' ); --Axel -INSERT INTO Partenaire( +INSERT INTO Partenaire VALUES ( 01, 'MAKL', 'France' ); -INSERT INTO Projet ( +INSERT INTO Projet VALUES ( 03, 'Programation web', 'ProgWeb', @@ -221,7 +228,7 @@ INSERT INTO Projet ( 003 ); -INSERT INTO Publication ( +INSERT INTO Publication VALUES ( 001, 'recherche scientifique sur la chimie organique', DATE '2022-07-07', @@ -230,7 +237,7 @@ INSERT INTO Publication ( 220 ); -INSERT INTO Publication ( +INSERT INTO Publication VALUES ( 002, 'Page rank', DATE '2022-07-07', @@ -264,13 +271,13 @@ INSERT INTO Publie_Doctorant VALUES ( ); -INSERT INTO Evenememnt ( +INSERT INTO Evenememnt VALUES ( 0001, DATE '2022-07-07', DATE '2023-07-07' ); -INSERT INTO Evenememnt ( +INSERT INTO Evenememnt VALUES ( 0002, DATE '2022-01-07', DATE '2023-07-12' diff --git a/request.sql b/request.sql index 26b77ff..05bc058 100644 --- a/request.sql +++ b/request.sql @@ -35,8 +35,24 @@ WHERE date_soutenance IS NOT NULL; --Nathan Q7 SELECT nom, prenom FROM Personnel -WHERE idPersonnel NOT IN ( - SELECT idScientifique FROM Encadrement +WHERE idPersonnel IN ( + SELECT idScientifique FROM Scientifique + WHERE idScientifique NOT IN ( + SELECT idScientifique FROM Encadrement + ) +); + +-- Nathan Q9 +SELECT nom, prenom FROM Personnel +WHERE idPersonnel IN ( + SELECT idScientifique FROM Scientifique + WHERE idScientifique IN ( + SELECT idScientifique FROM Encadrement + WHERE idDoctorant IN ( + SELECT idDoctorant FROM Doctorant + WHERE date_soutenance < NOW() + ) + ) ); -- Ronan Q10 From 80bf883a8ff04e435805af1ca16adb2be85c033a Mon Sep 17 00:00:00 2001 From: Yasmine Grane-Belghmaidi Date: Fri, 9 Dec 2022 11:26:56 +0100 Subject: [PATCH 6/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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/insert.sql b/insert.sql index d5884ec..584db6e 100644 --- a/insert.sql +++ b/insert.sql @@ -229,7 +229,7 @@ INSERT INTO Projet ( ); --Yasmine -INSERT INTO Publication ( +INSERT INTO Publication VALUES( 001, 'recherche scientifique sur la chimie organique', DATE '2022-07-07', @@ -240,7 +240,7 @@ INSERT INTO Publication ( --Yasmine -INSERT INTO Publication ( +INSERT INTO Publication VALUES( 002, 'Page rank', DATE '2022-07-07', From a751bc1b7397e272645a4a672e267cef42359094 Mon Sep 17 00:00:00 2001 From: Bonnet Ronan Date: Fri, 9 Dec 2022 11:30:29 +0100 Subject: [PATCH 7/8] fix merge bug --- insert.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/insert.sql b/insert.sql index 4a6a80e..9e77ad3 100644 --- a/insert.sql +++ b/insert.sql @@ -158,7 +158,7 @@ INSERT INTO Labo_externe VALUES ( ); --Yasmine -INSERT INTO Projet ( +INSERT INTO Projet VALUES( 01, 'BaseDeDonnee', 'BDD', @@ -241,6 +241,7 @@ INSERT INTO Publication VALUES( ); --Yasmine +INSERT INTO Publication VALUES( 002, 'Page rank', DATE '2022-07-07', From 0bb56d3f4a805663f12fc1b54704ba1e7f948a5c Mon Sep 17 00:00:00 2001 From: Bonnet Ronan Date: Fri, 9 Dec 2022 11:31:02 +0100 Subject: [PATCH 8/8] text lost --- insert.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/insert.sql b/insert.sql index 9e77ad3..b5af5b0 100644 --- a/insert.sql +++ b/insert.sql @@ -116,8 +116,6 @@ INSERT INTO Encadrement VALUES ( 2 ); -INSERT INTO - INSERT INTO Labo_externe VALUES ( 1, 'CNES',