From 54c895f82266e182abcf3a232dc9a1e488e58498 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 2 Sep 2020 09:04:49 +0200 Subject: [PATCH] =?UTF-8?q?les=20servermodels=20ne=20sont=20plus=20associ?= =?UTF-8?q?=C3=A9s=20=C3=A0=20une=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/gen/create_tables.sql | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql index 8d0c1d7..af1a9f7 100644 --- a/db/gen/create_tables.sql +++ b/db/gen/create_tables.sql @@ -56,7 +56,6 @@ CREATE TABLE InfraServer( ServerName VARCHAR(255) NOT NULL UNIQUE, ServerDescription VARCHAR(255) NOT NULL, ServermodelName VARCHAR(255) NOT NULL, - ServermodelSourceName VARCHAR(255) NOT NULL, ServermodelReleaseDistribution VARCHAR(255) NOT NULL, SiteName VARCHAR(255) NOT NULL, ZonesName VARCHAR(255) [] NOT NULL, @@ -74,7 +73,7 @@ CREATE TABLE Release ( ReleaseId SERIAL PRIMARY KEY, ReleaseName VARCHAR(255) NOT NULL, ReleaseSourceName VARCHAR(255) NOT NULL, - ReleaseDistribution VARCHAR(20) CONSTRAINT releasedistribution_choice CHECK (ReleaseDistribution IN ('last', 'n-1', 'n-2')), + ReleaseDistribution VARCHAR(20) NOT NULL, UNIQUE (ReleaseName, ReleaseSourceName), UNIQUE (ReleaseDistribution, ReleaseSourceName) ); @@ -98,13 +97,11 @@ CREATE TABLE Servermodel ( ServermodelDescription VARCHAR(255) NOT NULL, Osname VARCHAR(255), Osversion VARCHAR(255), - ISO VARCHAR(255), ServermodelParents VARCHAR(255) [] DEFAULT '{}', - SourceName VARCHAR(255) NOT NULL, - ReleaseName VARCHAR(255) NOT NULL, ReleaseDistribution VARCHAR(255) NOT NULL, + ReleaseName VARCHAR(255) NOT NULL, ServermodelApplicationserviceId INTEGER NOT NULL, - UNIQUE (ServermodelName, SourceName, ReleaseName) + UNIQUE (ServermodelName, ReleaseDistribution) ); CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId); @@ -113,10 +110,11 @@ CREATE TABLE Applicationservice ( ApplicationserviceId SERIAL PRIMARY KEY, ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL, + ReleaseDistribution VARCHAR(255) NOT NULL, ReleaseName VARCHAR(255) NOT NULL, SourceName VARCHAR(255) NOT NULL, OS JSON, - UNIQUE (ApplicationserviceName, ReleaseName, SourceName) + UNIQUE (ApplicationserviceName, ReleaseDistribution) ); CREATE TABLE ApplicationserviceDependency (