diff --git a/app/models/org.rb b/app/models/org.rb index 61750ce..590fbb5 100644 --- a/app/models/org.rb +++ b/app/models/org.rb @@ -23,7 +23,6 @@ # feedback_enabled :boolean default("false") # feedback_email_subject :string # feedback_email_msg :text -# active :boolean default("true") # # Indexes # diff --git a/app/models/structured_answer.rb b/app/models/structured_answer.rb index a43713c..48e6ef5 100644 --- a/app/models/structured_answer.rb +++ b/app/models/structured_answer.rb @@ -9,7 +9,6 @@ # created_at :datetime not null # updated_at :datetime not null # classname :string -# parent_id :integer # # Indexes # @@ -20,6 +19,7 @@ class StructuredAnswer < ActiveRecord::Base belongs_to :answer belongs_to :structured_data_schema + self.inheritance_column = :classname diff --git a/db/migrate/20200313143640_add_parent_id_to_structured_answer.rb b/db/migrate/20200313143640_add_parent_id_to_structured_answer.rb deleted file mode 100644 index 4400697..0000000 --- a/db/migrate/20200313143640_add_parent_id_to_structured_answer.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddParentIdToStructuredAnswer < ActiveRecord::Migration - def change - add_column :structured_answers, :parent_id, :integer - end -end diff --git a/db/schema.rb b/db/schema.rb index f655258..310d1cb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20200313143640) do +ActiveRecord::Schema.define(version: 20200313135459) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -196,7 +196,6 @@ t.boolean "feedback_enabled", default: false t.string "feedback_email_subject" t.text "feedback_email_msg" - t.boolean "active", default: true end add_index "orgs", ["language_id"], name: "orgs_language_id_idx", using: :btree @@ -421,7 +420,6 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "classname" - t.integer "parent_id" end add_index "structured_answers", ["answer_id"], name: "index_structured_answers_on_answer_id", using: :btree diff --git a/spec/factories/orgs.rb b/spec/factories/orgs.rb index b5b07ca..bfdaeac 100644 --- a/spec/factories/orgs.rb +++ b/spec/factories/orgs.rb @@ -22,7 +22,6 @@ # feedback_enabled :boolean default("false") # feedback_email_subject :string # feedback_email_msg :text -# active :boolean default("true") # # Indexes # diff --git a/spec/factories/structured_answers.rb b/spec/factories/structured_answers.rb index 2179ba3..a7e4796 100644 --- a/spec/factories/structured_answers.rb +++ b/spec/factories/structured_answers.rb @@ -9,7 +9,6 @@ # created_at :datetime not null # updated_at :datetime not null # classname :string -# parent_id :integer # # Indexes #