Compare commits

...

2 commits

Author SHA1 Message Date
Olougouna Axel
48e7463f11 Merge branch 'master' of https://git.etud.insa-toulouse.fr/rbonnet/tp_bdd2
doctorant
2022-12-09 12:12:04 +01:00
Olougouna Axel
a162665e54 correction Doctorant 2022-12-09 12:11:59 +01:00

View file

@ -106,7 +106,6 @@ NOT IN ( (SELECT idScientifique
FROM Encadrement) FROM Encadrement)
); );
<<<<<<< HEAD
-- Axel Q12 -- Axel Q12
SELECT idEnseignant FROM Enseignant_Chercheur ec SELECT idEnseignant FROM Enseignant_Chercheur ec
@ -121,9 +120,7 @@ WHERE pub.classeConf = 'A';
-- Yasmine QUESTION 14 -- Yasmine QUESTION 14
=======
-- Yasmine QUESTION 14 Testé -- Yasmine QUESTION 14 Testé
>>>>>>> af456634e468d2a6e5d3dbc4e169d73853af5baf
SELECT Count(Distinct idPublication) SELECT Count(Distinct idPublication)
FROM Publication FROM Publication