projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f2c626
)
add PipelineInvocation#properties
author
Tom Clegg <tom@clinicalfuture.com>
Mon, 18 Feb 2013 18:16:13 +0000
(10:16 -0800)
committer
Tom Clegg <tom@clinicalfuture.com>
Mon, 18 Feb 2013 18:16:13 +0000
(10:16 -0800)
app/controllers/orvos/v1/pipeline_invocations_controller.rb
patch
|
blob
|
history
app/models/pipeline_invocation.rb
patch
|
blob
|
history
db/migrate/20130218181504_add_properties_to_pipeline_invocations.rb
[new file with mode: 0644]
patch
|
blob
db/schema.rb
patch
|
blob
|
history
diff --git
a/app/controllers/orvos/v1/pipeline_invocations_controller.rb
b/app/controllers/orvos/v1/pipeline_invocations_controller.rb
index 2b9738efbc9e8f30fea0dadeab61c4ad92e43914..7e4fe3c7a48d54ddf20ef8eeb117ec712706beed 100644
(file)
--- a/
app/controllers/orvos/v1/pipeline_invocations_controller.rb
+++ b/
app/controllers/orvos/v1/pipeline_invocations_controller.rb
@@
-1,3
+1,4
@@
class Orvos::V1::PipelineInvocationsController < ApplicationController
accept_attribute_as_json :components, Hash
class Orvos::V1::PipelineInvocationsController < ApplicationController
accept_attribute_as_json :components, Hash
+ accept_attribute_as_json :properties, Hash
end
end
diff --git
a/app/models/pipeline_invocation.rb
b/app/models/pipeline_invocation.rb
index c355056d348b7a9d69290b7cfa3f09f579206f7e..32e8a4f57a3a8d5a501014c012a99aeaf261b464 100644
(file)
--- a/
app/models/pipeline_invocation.rb
+++ b/
app/models/pipeline_invocation.rb
@@
-3,6
+3,7
@@
class PipelineInvocation < OrvosModel
include KindAndEtag
include CommonApiTemplate
serialize :components, Hash
include KindAndEtag
include CommonApiTemplate
serialize :components, Hash
+ serialize :properties, Hash
belongs_to :pipeline, :foreign_key => :pipeline_uuid, :primary_key => :uuid
attr_accessor :pipeline
belongs_to :pipeline, :foreign_key => :pipeline_uuid, :primary_key => :uuid
attr_accessor :pipeline
diff --git a/db/migrate/20130218181504_add_properties_to_pipeline_invocations.rb
b/db/migrate/20130218181504_add_properties_to_pipeline_invocations.rb
new file mode 100644
(file)
index 0000000..
62bb592
--- /dev/null
+++ b/
db/migrate/20130218181504_add_properties_to_pipeline_invocations.rb
@@ -0,0
+1,5
@@
+class AddPropertiesToPipelineInvocations < ActiveRecord::Migration
+ def change
+ add_column :pipeline_invocations, :properties, :text
+ end
+end
diff --git
a/db/schema.rb
b/db/schema.rb
index 96fcd597985d056ef8dd52618e702ce48ab34823..70307e1e3c63cd50eced9eb61f2cf55993afee64 100644
(file)
--- a/
db/schema.rb
+++ b/
db/schema.rb
@@
-11,7
+11,7
@@
#
# It's strongly recommended to check this file into your version control system.
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 201302
07195855
) do
+ActiveRecord::Schema.define(:version => 201302
18181504
) do
create_table "api_client_authorizations", :force => true do |t|
t.string "api_token", :null => false
create_table "api_client_authorizations", :force => true do |t|
t.string "api_token", :null => false
@@
-211,6
+211,7
@@
ActiveRecord::Schema.define(:version => 20130207195855) do
t.boolean "success"
t.boolean "active", :default => false
t.datetime "updated_at"
t.boolean "success"
t.boolean "active", :default => false
t.datetime "updated_at"
+ t.text "properties"
end
add_index "pipeline_invocations", ["created_at"], :name => "index_pipeline_invocations_on_created_at"
end
add_index "pipeline_invocations", ["created_at"], :name => "index_pipeline_invocations_on_created_at"