Compare commits

..

No commits in common. "97b450f3e19bda87782a1fa305f8d98fea895b4b" and "d1713cf14fbfbef0546be1f9abd0731d8aa312af" have entirely different histories.

View file

@ -1,4 +1,4 @@
INSERT INTO Personnel (
INSERT INTO Personnel VALUES (
0,
'Billard',
'Nathan',
@ -8,32 +8,7 @@ INSERT INTO Personnel (
);
--Axel
INSERT INTO Etablissement(
01,
'Institut National des Sciences Appliquées',
'INSA',
'Toulouse'
);
--Axel
INSERT INTO Etablissement(
02,
'Ecole Nationale de l Aviation Civile',
'ENAC',
'Toulouse'
);
--Axel
INSERT INTO Etablissement(
03,
'Ecole Polytechnique',
'X',
'Paris'
);
INSERT INTO Personnel (
INSERT INTO Personnel VALUES (
1,
'Bonnet',
'Ronan',
@ -42,7 +17,7 @@ INSERT INTO Personnel (
'2020-9-15'
);
INSERT INTO Personnel (
INSERT INTO Personnel VALUES (
2,
'Olougouna',
'Axel',
@ -51,7 +26,7 @@ INSERT INTO Personnel (
'2020-9-15'
);
INSERT INTO Personnel (
INSERT INTO Personnel VALUES (
3,
'Grane',
'Yasmine',
@ -60,7 +35,7 @@ INSERT INTO Personnel (
'2020-9-15'
);
INSERT INTO Personnel (
INSERT INTO Personnel VALUES (
4,
'Wonderland',
'Alice',
@ -69,23 +44,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',
'au chantier',
'2020-9-15'
);--Axel
INSERT INTO Partenaire(
01,
'GFGH',
'Allemagne'
);
INSERT INTO Doctorant VALUES (
@ -106,55 +71,50 @@ INSERT INTO Scientifique VALUES (
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
0,
'LAAS',
'France'
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
1,
'CNES',
'France'
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
2,
'GEAS',
'Allemagne'
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
3,
'RUAF',
'Russie'
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
4,
'ENFD',
'Angleterre'
);
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
5,
'LUBN',
'Luxembourg'
);
<<<<<<< HEAD
-- Ronan
=======
>>>>>>> ebb8e0ebb042c8e6526d6db68553636d759f3b9a
INSERT INTO Labo_externe (
INSERT INTO Labo_externe VALUES (
6,
'BRBN',
'Bresil'
);
INSERT INTO Projet (
INSERT INTO Projet VALUES (
01,
'BaseDeDonnee',
'BDD',
@ -166,7 +126,7 @@ INSERT INTO Projet (
001
);
INSERT INTO Projet (
INSERT INTO Projet VALUES (
02,
'langC',
'C',
@ -178,42 +138,7 @@ INSERT INTO Projet (
002
);
--Axel
INSERT INTO Partenaire(
01,
'GFGH',
'Allemagne'
);
--Axel
INSERT INTO Partenaire(
02,
'LMC',
'Australie'
);
--Axel
INSERT INTO Partenaire(
03,
'ESHT',
'USA'
);
--Axel
INSERT INTO Partenaire(
01,
'HLMY',
'Japon'
);
--Axel
INSERT INTO Partenaire(
01,
'MAKL',
'France'
);
INSERT INTO Projet (
INSERT INTO Projet VALUES (
03,
'Programation web',
'ProgWeb',
@ -225,7 +150,7 @@ INSERT INTO Projet (
003
);
INSERT INTO Publication (
INSERT INTO Publication VALUES (
001,
'recherche scientifique sur la chimie organique',
DATE '2022-07-07',
@ -234,7 +159,7 @@ INSERT INTO Publication (
220
);
INSERT INTO Publication (
INSERT INTO Publication VALUES (
002,
'Page rank',
DATE '2022-07-07',
@ -243,8 +168,6 @@ INSERT INTO Publication (
220
);
<<<<<<< HEAD
=======
INSERT INTO Publication VALUES (
003,
'chaine de markov',
@ -270,26 +193,22 @@ INSERT INTO Publie_Doctorant VALUES (
);
>>>>>>> d1713cf14fbfbef0546be1f9abd0731d8aa312af
INSERT INTO Evenememnt (
INSERT INTO Evenememnt VALUES (
0001,
DATE '2022-07-07',
DATE '2023-07-07'
);
INSERT INTO Evenememnt (
INSERT INTO Evenememnt VALUES (
0002,
DATE '2022-01-07',
DATE '2023-07-12'
);
<<<<<<< HEAD
=======
INSERT INTO Evenememnt VALUES (
0003,
DATE '2022-02-10',
DATE '2023-03-12'
);
>>>>>>> d1713cf14fbfbef0546be1f9abd0731d8aa312af