Merge branch '3342-pipeline-output-current-project' closes #3342

[arvados.git] / services / api / db / structure.sql

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index aa05031fe0ec8c45a73d1fd41320f1c3913e10d5..9bcb3fbc6565c1d0e8e3778cc7ad7516a5acec9c 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -3,7 +3,6 @@
 --
 
 SET statement_timeout = 0;
-SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;
@@ -154,7 +153,6 @@ ALTER SEQUENCE authorized_keys_id_seq OWNED BY authorized_keys.id;
 
 CREATE TABLE collections (
     id integer NOT NULL,
-    locator character varying(255),
     owner_uuid character varying(255),
     created_at timestamp without time zone NOT NULL,
     modified_by_client_uuid character varying(255),
@@ -167,7 +165,11 @@ CREATE TABLE collections (
     redundancy_confirmed_as integer,
     updated_at timestamp without time zone NOT NULL,
     uuid character varying(255),
-    manifest_text text
+    manifest_text text,
+    name character varying(255),
+    description character varying(255),
+    properties text,
+    expires_at date
 );
 
 
@@ -269,7 +271,7 @@ CREATE TABLE groups (
     modified_by_client_uuid character varying(255),
     modified_by_user_uuid character varying(255),
     modified_at timestamp without time zone,
-    name character varying(255),
+    name character varying(255) NOT NULL,
     description text,
     updated_at timestamp without time zone NOT NULL,
     group_class character varying(255)
@@ -425,9 +427,10 @@ CREATE TABLE jobs (
     runtime_constraints text,
     nondeterministic boolean,
     repository character varying(255),
-    output_is_persistent boolean DEFAULT false NOT NULL,
     supplied_script_version character varying(255),
-    docker_image_locator character varying(255)
+    docker_image_locator character varying(255),
+    name character varying(255),
+    description text
 );
 
 
@@ -676,7 +679,8 @@ CREATE TABLE pipeline_instances (
     updated_at timestamp without time zone NOT NULL,
     properties text,
     state character varying(255),
-    components_summary text
+    components_summary text,
+    description text
 );
 
 
@@ -1267,6 +1271,20 @@ ALTER TABLE ONLY virtual_machines
     ADD CONSTRAINT virtual_machines_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: collection_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX collection_owner_uuid_name_unique ON collections USING btree (owner_uuid, name);
+
+
+--
+-- Name: groups_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX groups_owner_uuid_name_unique ON groups USING btree (owner_uuid, name);
+
+
 --
 -- Name: index_api_client_authorizations_on_api_client_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -1778,6 +1796,13 @@ CREATE INDEX index_virtual_machines_on_hostname ON virtual_machines USING btree
 CREATE UNIQUE INDEX index_virtual_machines_on_uuid ON virtual_machines USING btree (uuid);
 
 
+--
+-- Name: jobs_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX jobs_owner_uuid_name_unique ON jobs USING btree (owner_uuid, name);
+
+
 --
 -- Name: links_tail_name_unique_if_link_class_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -1785,6 +1810,20 @@ CREATE UNIQUE INDEX index_virtual_machines_on_uuid ON virtual_machines USING btr
 CREATE UNIQUE INDEX links_tail_name_unique_if_link_class_name ON links USING btree (tail_uuid, name) WHERE ((link_class)::text = 'name'::text);
 
 
+--
+-- Name: pipeline_instance_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX pipeline_instance_owner_uuid_name_unique ON pipeline_instances USING btree (owner_uuid, name);
+
+
+--
+-- Name: pipeline_template_owner_uuid_name_unique; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX pipeline_template_owner_uuid_name_unique ON pipeline_templates USING btree (owner_uuid, name);
+
+
 --
 -- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -1976,4 +2015,14 @@ INSERT INTO schema_migrations (version) VALUES ('20140627210837');
 
 INSERT INTO schema_migrations (version) VALUES ('20140709172343');
 
-INSERT INTO schema_migrations (version) VALUES ('20140714184006');
\ No newline at end of file
+INSERT INTO schema_migrations (version) VALUES ('20140714184006');
+
+INSERT INTO schema_migrations (version) VALUES ('20140811184643');
+
+INSERT INTO schema_migrations (version) VALUES ('20140815171049');
+
+INSERT INTO schema_migrations (version) VALUES ('20140817035914');
+
+INSERT INTO schema_migrations (version) VALUES ('20140818125735');
+
+INSERT INTO schema_migrations (version) VALUES ('20140826180337');
\ No newline at end of file