Merge branch 'master' into 3382-always-show-inputs

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

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index af97f678006efd32c86553e5ce35478b8c87195e..2eca2caf16abcfec8cde761b639f931e3dc8cb42 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -431,7 +431,9 @@ CREATE TABLE jobs (
     supplied_script_version character varying(255),
     docker_image_locator character varying(255),
     priority integer DEFAULT 0 NOT NULL,
-    description text
+    description text,
+    state character varying(255),
+    arvados_sdk_version character varying(255)
 );
 
 
@@ -639,7 +641,9 @@ CREATE TABLE nodes (
     first_ping_at timestamp without time zone,
     last_ping_at timestamp without time zone,
     info text,
-    updated_at timestamp without time zone NOT NULL
+    updated_at timestamp without time zone NOT NULL,
+    properties text,
+    job_uuid character varying(255)
 );
 
 
@@ -681,9 +685,9 @@ CREATE TABLE pipeline_instances (
     properties text,
     state character varying(255),
     components_summary text,
-    description text,
     started_at timestamp without time zone,
-    finished_at timestamp without time zone
+    finished_at timestamp without time zone,
+    description text
 );
 
 
@@ -872,7 +876,7 @@ ALTER SEQUENCE traits_id_seq OWNED BY traits.id;
 CREATE TABLE users (
     id integer NOT NULL,
     uuid character varying(255),
-    owner_uuid character varying(255),
+    owner_uuid character varying(255) NOT NULL,
     created_at timestamp without time zone NOT NULL,
     modified_by_client_uuid character varying(255),
     modified_by_user_uuid character varying(255),
@@ -1986,32 +1990,20 @@ INSERT INTO schema_migrations (version) VALUES ('20140423133559');
 
 INSERT INTO schema_migrations (version) VALUES ('20140501165548');
 
-INSERT INTO schema_migrations (version) VALUES ('20140509143351');
-
 INSERT INTO schema_migrations (version) VALUES ('20140519205916');
 
 INSERT INTO schema_migrations (version) VALUES ('20140527152921');
 
-INSERT INTO schema_migrations (version) VALUES ('20140528143351');
-
 INSERT INTO schema_migrations (version) VALUES ('20140530200539');
 
 INSERT INTO schema_migrations (version) VALUES ('20140601022548');
 
 INSERT INTO schema_migrations (version) VALUES ('20140602143352');
 
-INSERT INTO schema_migrations (version) VALUES ('20140602143353');
-
 INSERT INTO schema_migrations (version) VALUES ('20140607150616');
 
-INSERT INTO schema_migrations (version) VALUES ('20140610210836');
-
-INSERT INTO schema_migrations (version) VALUES ('20140610210837');
-
 INSERT INTO schema_migrations (version) VALUES ('20140611173003');
 
-INSERT INTO schema_migrations (version) VALUES ('20140613210837');
-
 INSERT INTO schema_migrations (version) VALUES ('20140627210837');
 
 INSERT INTO schema_migrations (version) VALUES ('20140709172343');
@@ -2030,4 +2022,14 @@ INSERT INTO schema_migrations (version) VALUES ('20140828141043');
 
 INSERT INTO schema_migrations (version) VALUES ('20140909183946');
 
-INSERT INTO schema_migrations (version) VALUES ('20140911221252');
\ No newline at end of file
+INSERT INTO schema_migrations (version) VALUES ('20140911221252');
+
+INSERT INTO schema_migrations (version) VALUES ('20140918141529');
+
+INSERT INTO schema_migrations (version) VALUES ('20140918153541');
+
+INSERT INTO schema_migrations (version) VALUES ('20140918153705');
+
+INSERT INTO schema_migrations (version) VALUES ('20140924091559');
+
+INSERT INTO schema_migrations (version) VALUES ('20141111133038');
\ No newline at end of file