solve merge errors
This commit is contained in:
commit
aa9cc1b454
1 changed files with 52 additions and 0 deletions
|
@ -53,6 +53,15 @@ CREATE TABLE Enseignant_Chercheur(
|
|||
);
|
||||
|
||||
|
||||
--Axel
|
||||
CREATE TABLE Etablissement(
|
||||
idEtablissement INT CONSTRAINT UnEtablissement PRIMARY Key,
|
||||
nom VARCHAR,
|
||||
acronyme VARCHAR,
|
||||
adresse VARCHAR,
|
||||
);
|
||||
|
||||
CREATE TABLE Enseignant_Chercheur
|
||||
-- Nathan
|
||||
CREATE TABLE Evenement(
|
||||
idEvenement INT NOT NULL,
|
||||
|
@ -170,3 +179,46 @@ CREATE TABLE Organise (
|
|||
FOREIGN KEY (idPersonnel) REFERENCES Personnel(idPersonnel),
|
||||
PRIMARY KEY(idPortesOuverte, idPersonnel)
|
||||
);
|
||||
--Yasmine
|
||||
CREATE TABLE Projet (
|
||||
titre char,
|
||||
acronyme char,
|
||||
annee_debut date,
|
||||
annee_fin char,
|
||||
duree INT NOT NULL,
|
||||
budget_Laas INT NOT NULL,
|
||||
cout INT NOT NULL,
|
||||
FOREIGN KEY (idScientifique) REFERENCES Scientifique(idScientifique),
|
||||
PRIMARY KEY(idProjet),
|
||||
);
|
||||
--Yasmine
|
||||
CREATE TABLE Encadrement (
|
||||
FOREIGN KEY (idDoctorant) REFERENCES Doctorant(idDoctorant),
|
||||
FOREIGN KEY (idScientifique) REFERENCES Scientifique(idScientifique),
|
||||
PRIMARY KEY(idScientifique,idDoctorant),
|
||||
);
|
||||
|
||||
--Yasmine
|
||||
CREATE TABLE Etablissement (
|
||||
nom char,
|
||||
acronyme char,
|
||||
adresse char,
|
||||
PRIMARY KEY(idEtablissement),
|
||||
);
|
||||
--Yasmine
|
||||
|
||||
CREATE TABLE Partenaire(
|
||||
PRIMARY KEY(idPartenaire),
|
||||
nom char,
|
||||
pays char,
|
||||
);
|
||||
|
||||
--Yasmine
|
||||
|
||||
CREATE TABLE Evenement(
|
||||
PRIMARY KEY(idEvenement),
|
||||
date_debut DATE,
|
||||
date_fin DATE,
|
||||
);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue