insert.sql

@@ -69,8 +69,13 @@ INSERT INTO Personnel (
     '2020-9-15'
 );
 
+<<<<<<< HEAD
+INSERT INTO Personnel (
+    4,
+=======
 INSERT INTO Personnel VALUES (
     5,
+>>>>>>> d1713cf14fbfbef0546be1f9abd0731d8aa312af
     'Le Bricoleur',
     'Bob',
     DATE '1878-12-25',
@@ -100,10 +105,6 @@ INSERT INTO Scientifique VALUES (
     'cr1'
 );
 
-INSERT INTO Scientifique VALUES (
-    2,
-    'cr1'
-);
 
 INSERT INTO Labo_externe (
     0,
@@ -142,8 +143,11 @@ INSERT INTO Labo_externe (
 );
 
 
+<<<<<<< HEAD
 
 -- Ronan
+=======
+>>>>>>> ebb8e0ebb042c8e6526d6db68553636d759f3b9a
 INSERT INTO Labo_externe (
     6,
     'BRBN',
@@ -239,6 +243,8 @@ INSERT INTO Publication (
   	220
 );
 
+<<<<<<< HEAD
+=======
 INSERT INTO Publication VALUES (
     003,
     'chaine de markov',
@@ -264,6 +270,8 @@ INSERT INTO Publie_Doctorant VALUES (
 );
 
 
+>>>>>>> d1713cf14fbfbef0546be1f9abd0731d8aa312af
+
 INSERT INTO Evenememnt (
     0001,
     DATE '2022-07-07',
@@ -276,8 +284,12 @@ INSERT INTO Evenememnt (
     DATE '2023-07-12'	
 );
 
+<<<<<<< HEAD
+=======
 INSERT INTO Evenememnt VALUES (
     0003,
     DATE '2022-02-10',
     DATE '2023-03-12'
 );
+
+>>>>>>> d1713cf14fbfbef0546be1f9abd0731d8aa312af

request.sql

@@ -66,7 +66,7 @@ GROUP BY idDoctorant;
 SELECT idEnseignant
 FROM Enseignant-chercheur
 NOT IN ( (SELECT idScientifique
-               FROM Publie_scientifique)
+               FROM Publication)
                UNION
 	      (SELECT idScientifique
                FROM Encadrement)