Merge branch 'master' into 2352-phased-pipeline-instance-state

[arvados.git] / services / api / db / schema.rb

diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index a63fdf4fe7a75cf2dad81bfa256ca68ae29b470a..ab39901db41aea6902ca2c08851277fac018eb67 100644 (file)
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140402001908) do
+ActiveRecord::Schema.define(:version => 20140422011506) do
 
   create_table "api_client_authorizations", :force => true do |t|
     t.string   "api_token",                                           :null => false
@@ -182,8 +182,8 @@ ActiveRecord::Schema.define(:version => 20140402001908) do
     t.boolean  "running"
     t.boolean  "success"
     t.string   "output"
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "priority"
     t.string   "is_locked_by_uuid"
     t.string   "log"
@@ -245,6 +245,8 @@ ActiveRecord::Schema.define(:version => 20140402001908) do
     t.string   "head_uuid"
     t.text     "properties"
     t.datetime "updated_at"
+    t.string   "head_kind"
+    t.string   "tail_kind"
   end
 
   add_index "links", ["created_at"], :name => "index_links_on_created_at"
@@ -262,7 +264,7 @@ ActiveRecord::Schema.define(:version => 20140402001908) do
     t.datetime "event_at"
     t.string   "event_type"
     t.text     "summary"
-    t.text     "info"
+    t.text     "properties"
     t.datetime "created_at",              :null => false
     t.datetime "updated_at",              :null => false
     t.datetime "modified_at"
@@ -309,10 +311,12 @@ ActiveRecord::Schema.define(:version => 20140402001908) do
     t.string   "pipeline_template_uuid"
     t.string   "name"
     t.text     "components"
-    t.boolean  "success"
-    t.boolean  "active",                  :default => false
     t.datetime "updated_at"
     t.text     "properties"
+    t.boolean  "active"
+    t.boolean  "success"
+    t.string   "state"
+    t.text     "components_summary"
   end
 
   add_index "pipeline_instances", ["created_at"], :name => "index_pipeline_instances_on_created_at"