request.sql

@@ -34,11 +34,8 @@ WHERE idScientifique = '01';
 
 
 -- Axel Q4
-SELECT COUNT(DISTINCT pays) AS nbPaysCollab FROM Labo_Externe le
-RIGHT JOIN Auteur_Externe ae ON ae.idLabo = le.idLabo
-RIGHT JOIN Publie_Externe pe ON pe.idAuteurExterne = ae.idAuteurExterne
-JOIN Publication pub ON pub.idPublication = pe.idPublication
-WHERE pub.classeConf = 'A';
+SELECT COUNT(DISTINCT ) as nbPaysCollab FROM Publication
+WHERE classeConf = 'A';
 
 -- Nathan Q5
 SELECT idDoctorant, COUNT(idPublication) FROM Publie_Doctorant
@@ -103,24 +100,7 @@ NOT IN ( (SELECT idScientifique
                FROM Encadrement)
 	) ;
 
-<<<<<<< HEAD
-
--- Axel Q12
-SELECT idEnseignant FROM Enseignant_Chercheur ec
-RIGHT JOIN Publie_Scientifique ps ON ps.idScientifique = ec.idScientifique
-RIGHT JOIN Publication pub ON pub.idPublication = ps.idScientifique
-WHERE pub.classeConf = 'A';
---EXCEPT SELECT idEnseignant FROM Enseignant_Chercheur ec
---RIGHT JOIN Publie_Scientifique ps ON ps.idScientifique = ec.idScientifique
---RIGHT JOIN Publication pub ON pub.idPublication = ps.idScientifique
---WHERE pub.classeConf = 'A'
---    AND pub.classeConf IN  'A*' 'B';
-
-
--- Yasmine QUESTION 14
-=======
 -- Yasmine QUESTION 14 Testé
->>>>>>> af456634e468d2a6e5d3dbc4e169d73853af5baf
 
 SELECT Count(Distinct idPublication)
 FROM Publication

tables.sql

@@ -1,5 +1,5 @@
 -- Nathan
-CREATE TYPE T_CLASSECONF AS ENUM (
+CREATE TYPE echelon AS ENUM (
     'A*',
     'A',
     'B',
@@ -7,23 +7,13 @@ CREATE TYPE T_CLASSECONF AS ENUM (
 );
 
 -- Nathan
-CREATE TYPE T_GRADE AS ENUM (
+CREATE TYPE grade AS ENUM (
     'cr1',
     'cr2',
     'mcf',
     'mcf hors classe'
 );
 
-CREATE TYPE T_ECHELON AS ENUM (
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7
-);
-
 -- Axel
 CREATE TABLE Personnel
 (
@@ -37,7 +27,9 @@ CREATE TABLE Personnel
 
 --Axel
 CREATE TABLE Doctorant(
-    idDoctorant INécheloe DATE,
+    idDoctorant INT NOT NULL,
+    date_debut_these DATE,
+    date_soutenance DATE,
     FOREIGN KEY (idDoctorant) REFERENCES Personnel(idPersonnel) ON DELETE CASCADE,
     PRIMARY KEY(idDoctorant)
 );
@@ -45,7 +37,7 @@ CREATE TABLE Doctorant(
 --Yasmine
 CREATE TABLE Scientifique(
     idScientifique INT NOT NULL,
-    grade T_GRADE,
+    grade VARCHAR,
     FOREIGN KEY (idScientifique) REFERENCES Personnel(idPersonnel) ON DELETE CASCADE,
     PRIMARY KEY (idScientifique)
 );
@@ -63,7 +55,7 @@ CREATE TABLE Etablissement(
 CREATE TABLE Enseignant_Chercheur(
     idEnseignant INT NOT NULL,
     idEtablissement INT NOT NULL,
-    echelon T_ECHELON,
+    echelon ECHELON,
     FOREIGN KEY (idEtablissement) REFERENCES Etablissement(idEtablissement) ON DELETE CASCADE,
     FOREIGN KEY (idEnseignant) REFERENCES Personnel(idPersonnel) ON DELETE CASCADE,
     PRIMARY KEY (idEnseignant)
@@ -126,7 +118,7 @@ CREATE TABLE Publication(
     titre VARCHAR,
     annee DATE,
     nomConf VARCHAR,
-    classeConf T_CLASSECONF,
+    classeConf VARCHAR,
     nbPages INT,
     PRIMARY KEY (idPublication)
 );