X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=136e7e1851c0d7798c7375d72fde74949f4e43ef;hb=7e3bff350ada6ba7916d47da7f78fad2d547359e;hp=812135d65a6787a18b1610af5727931dcec00b72;hpb=358d0706392ccb29cc2a08b469f6f81cf58dbc23;p=plcapi.git

diff --git a/planetlab4.sql b/planetlab4.sql
index 812135d..136e7e1 100644
--- a/planetlab4.sql
+++ b/planetlab4.sql
@@ -9,7 +9,7 @@
 --
 -- Copyright (C) 2006 The Trustees of Princeton University
 --
--- $Id: planetlab4.sql,v 1.38 2006/11/15 21:34:48 tmack Exp $
+-- $Id: planetlab4.sql,v 1.40 2006/11/17 10:43:17 thierry Exp $
 --
 
 --------------------------------------------------------------------------------
@@ -554,10 +554,10 @@ CREATE TABLE slices (
     created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Creation date
     expires timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP + '2 weeks', -- Expiration date
 
-    deleted boolean NOT NULL DEFAULT false
+    is_deleted boolean NOT NULL DEFAULT false
 ) WITH OIDS;
-CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE deleted IS false;
-CREATE INDEX slices_name_idx ON slices (name) WHERE deleted IS false;
+CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE is_deleted IS false;
+CREATE INDEX slices_name_idx ON slices (name) WHERE is_deleted IS false;
 
 -- Slivers
 CREATE TABLE slice_node (
@@ -591,6 +591,7 @@ CREATE VIEW site_slices AS
 SELECT site_id,
 array_accum(slice_id) AS slice_ids
 FROM slices
+WHERE is_deleted is false
 GROUP BY site_id;
 
 -- Slices - peer relationship
@@ -972,7 +973,7 @@ slices.url,
 slices.description,
 slices.max_nodes,
 slices.creator_person_id,
-slices.deleted,
+slices.is_deleted,
 CAST(date_part('epoch', slices.created) AS bigint) AS created,
 CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
 COALESCE(slice_nodes.node_ids, '{}') AS node_ids,
@@ -996,7 +997,7 @@ slices.instantiation,
 slices.url,
 slices.description,
 slices.max_nodes,
-slices.deleted,
+slices.is_deleted,
 CAST(date_part('epoch', slices.created) AS bigint) AS created,
 CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
 COALESCE(slice_nodes.node_ids, '{}') AS node_ids