diff --git a/insert.sql b/insert.sql index 9c001dd..c7796f1 100644 --- a/insert.sql +++ b/insert.sql @@ -84,42 +84,36 @@ INSERT INTO Partenaire( ); --- Ronan INSERT INTO Labo_externe ( 0, 'LAAS', 'France' ); --- Ronan INSERT INTO Labo_externe ( 1, 'CNES', 'France' ); --- Ronan INSERT INTO Labo_externe ( 2, 'GEAS', 'Allemagne' ); --- Ronan INSERT INTO Labo_externe ( 3, 'RUAF', 'Russie' ); --- Ronan INSERT INTO Labo_externe ( 4, 'ENFD', 'Angleterre' ); --- Ronan INSERT INTO Labo_externe ( 5, 'LUBN', @@ -127,59 +121,17 @@ INSERT INTO Labo_externe ( ); +<<<<<<< HEAD -- Ronan +======= +>>>>>>> ebb8e0ebb042c8e6526d6db68553636d759f3b9a INSERT INTO Labo_externe ( 6, 'BRBN', 'Bresil' ); --- Ronan -INSERT INTO Auteur_Externe ( - 0, - 'Jean', - 'Dupont', - 'dupont@mail.com', - 0 -); - --- Ronan -INSERT INTO Auteur_Externe ( - 1, - 'Jacques', - 'Tondu', - 'tondu@mail.com', - 0 -); - --- Ronan -INSERT INTO Auteur_Externe ( - 2, - 'Leonardo', - 'Paulo', - 'paulo@mail.com', - 6 -); - --- Ronan -INSERT INTO Auteur_Externe ( - 3, - 'Otto', - 'Schaofe', - 'schaofe@mail.com', - 2 -); - --- Ronan -INSERT INTO Auteur_Externe ( - 4, - 'Igor', - 'Medvedev', - 'medvedev@mail.com', - 3 -); - INSERT INTO Projet ( 01, 'BaseDeDonnee', @@ -204,6 +156,7 @@ INSERT INTO Projet ( 002 ); +<<<<<<< HEAD --Axel INSERT INTO Partenaire( @@ -239,6 +192,20 @@ INSERT INTO Partenaire( 'MAKL', 'France' ); +======= +INSERT INTO Projet ( + 03, + 'Programation web', + 'ProgWeb', + DATE '2022-04-07', + DATE '2022-06-07', + 80, + 10000, + 6000, + 003 +); + +>>>>>>> ebb8e0ebb042c8e6526d6db68553636d759f3b9a INSERT INTO Publication ( 001, 'recherche scientifique sur la chimie organique', diff --git a/request.sql b/request.sql new file mode 100644 index 0000000..1d170dd --- /dev/null +++ b/request.sql @@ -0,0 +1 @@ +-- Nathan