Merge branch 'master' into 5383-api-db-current-time

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

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 007d05ebb6fc74852f9c5297f65de2ae73a3a94b..0711f9025190bbf2a125d52e343f39b07a984d9d 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -168,7 +168,7 @@ CREATE TABLE collections (
     name character varying(255),
     description character varying(524288),
     properties text,
-    expires_at date,
+    expires_at timestamp without time zone,
     file_names character varying(8192)
 );
 
@@ -2362,4 +2362,6 @@ INSERT INTO schema_migrations (version) VALUES ('20150206230342');
 
 INSERT INTO schema_migrations (version) VALUES ('20150216193428');
 
-INSERT INTO schema_migrations (version) VALUES ('20150303210106');
\ No newline at end of file
+INSERT INTO schema_migrations (version) VALUES ('20150303210106');
+
+INSERT INTO schema_migrations (version) VALUES ('20150312151136');
\ No newline at end of file