rbonnet/tp_bdd2
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

corrigé les diffs dans les fichiers

Browse source
This commit is contained in:
nbillard 2022-12-09 11:11:34 +01:00
parent 1b052531a9
commit d258c6d065
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
insert.sql
View file

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