Compare commits

...

6 commits

Author SHA1 Message Date
Bonnet Ronan
a751bc1b73 fix merge bug 2022-12-09 11:30:29 +01:00
Bonnet Ronan
6ac25dd9f1 Merge branch 'master' of https://git.etud.insa-toulouse.fr/rbonnet/tp_bdd2 2022-12-09 11:29:43 +01:00
Bonnet Ronan
006bf39fee Merge branch 'master' of https://git.etud.insa-toulouse.fr/rbonnet/tp_bdd2 2022-12-09 11:28:23 +01:00
Bonnet Ronan
9cd9bf0b53 solve merge 2022-12-09 11:27:25 +01:00
Bonnet Ronan
1499655eed merge 2022-12-09 11:25:58 +01:00
Bonnet Ronan
14a10066e9 insert publie_scientifique 2022-12-09 11:25:13 +01:00

View file

@ -158,7 +158,7 @@ INSERT INTO Labo_externe VALUES (
); );
--Yasmine --Yasmine
INSERT INTO Projet ( INSERT INTO Projet VALUES(
01, 01,
'BaseDeDonnee', 'BaseDeDonnee',
'BDD', 'BDD',
@ -241,6 +241,7 @@ INSERT INTO Publication VALUES(
); );
--Yasmine --Yasmine
INSERT INTO Publication VALUES(
002, 002,
'Page rank', 'Page rank',
DATE '2022-07-07', DATE '2022-07-07',
@ -275,8 +276,22 @@ INSERT INTO Publie_Doctorant VALUES (
4 4
); );
--Yasmine INSERT INTO Publie_Scientifique VALUES (
1,
3
);
INSERT INTO Publie_Scientifique VALUES (
2,
3
);
INSERT INTO Publie_Scientifique VALUES (
1,
2
);
--Yasmine
INSERT INTO Evenememnt VALUES ( INSERT INTO Evenememnt VALUES (
0001, 0001,
DATE '2022-07-07', DATE '2022-07-07',
@ -284,7 +299,6 @@ INSERT INTO Evenememnt VALUES (
); );
--Yasmine --Yasmine
INSERT INTO Evenememnt VALUES ( INSERT INTO Evenememnt VALUES (
0002, 0002,
DATE '2022-01-07', DATE '2022-01-07',