From 9ff3e142bc42a613001aa3d24cf90d6b67a6ddff Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 19 Jan 2022 11:55:28 +0000 Subject: [PATCH] undo migration --- .../20220117104521_change_currency_types.rb | 43 ------------------- db/schema.rb | 18 ++++---- spec/models/form/question_spec.rb | 2 +- 3 files changed, 10 insertions(+), 53 deletions(-) delete mode 100644 db/migrate/20220117104521_change_currency_types.rb diff --git a/db/migrate/20220117104521_change_currency_types.rb b/db/migrate/20220117104521_change_currency_types.rb deleted file mode 100644 index d283c6138..000000000 --- a/db/migrate/20220117104521_change_currency_types.rb +++ /dev/null @@ -1,43 +0,0 @@ -class ChangeCurrencyTypes < ActiveRecord::Migration[7.0] - def up - change_table :case_logs, bulk: true do |t| - t.remove :earnings - t.column :earnings, :decimal, precision: 10, scale: 2 - t.remove :brent - t.column :brent, :decimal, precision: 10, scale: 2 - t.remove :scharge - t.column :scharge, :decimal, precision: 10, scale: 2 - t.remove :pscharge - t.column :pscharge, :decimal, precision: 10, scale: 2 - t.remove :supcharg - t.column :supcharg, :decimal, precision: 10, scale: 2 - t.remove :tcharge - t.column :tcharge, :decimal, precision: 10, scale: 2 - t.remove :tshortfall - t.column :tshortfall, :decimal, precision: 10, scale: 2 - t.remove :chcharge - t.column :chcharge, :decimal, precision: 10, scale: 2 - end - end - - def down - change_table :case_logs, bulk: true do |t| - t.remove :earnings - t.column :earnings, :integer - t.remove :brent - t.column :brent, :integer - t.remove :scharge - t.column :scharge, :integer - t.remove :pscharge - t.column :pscharge, :integer - t.remove :supcharg - t.column :supcharg, :integer - t.remove :tcharge - t.column :tcharge, :integer - t.remove :tshortfall - t.column :tshortfall, :integer - t.remove :chcharge - t.column :chcharge, :integer - end - end -end diff --git a/db/schema.rb b/db/schema.rb index 392273b6c..766b1cf55 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_01_17_104521) do +ActiveRecord::Schema.define(version: 2022_01_14_105351) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -84,15 +84,15 @@ ActiveRecord::Schema.define(version: 2022_01_17_104521) do t.integer "beds" t.integer "offered" t.integer "wchair" - t.decimal "earnings", precision: 10, scale: 2 + t.integer "earnings" t.integer "incfreq" t.integer "benefits" t.integer "period" - t.decimal "brent", precision: 10, scale: 2 - t.decimal "scharge", precision: 10, scale: 2 - t.decimal "pscharge", precision: 10, scale: 2 - t.decimal "supcharg", precision: 10, scale: 2 - t.decimal "tcharge", precision: 10, scale: 2 + t.integer "brent" + t.integer "scharge" + t.integer "pscharge" + t.integer "supcharg" + t.integer "tcharge" t.integer "layear" t.integer "lawaitlist" t.string "property_postcode" @@ -143,7 +143,7 @@ ActiveRecord::Schema.define(version: 2022_01_17_104521) do t.string "prevloc" t.integer "hb" t.integer "hbrentshortfall" - t.decimal "tshortfall", precision: 10, scale: 2 + t.integer "tshortfall" t.string "postcode" t.string "postcod2" t.string "ppostc1" @@ -181,7 +181,7 @@ ActiveRecord::Schema.define(version: 2022_01_17_104521) do t.string "has_benefits" t.integer "nocharge" t.integer "is_carehome" - t.decimal "chcharge", precision: 10, scale: 2 + t.decimal "chcharge" t.integer "letting_in_sheltered_accomodation" t.integer "household_charge" t.index ["discarded_at"], name: "index_case_logs_on_discarded_at" diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb index f84d682aa..9e6dbcf56 100644 --- a/spec/models/form/question_spec.rb +++ b/spec/models/form/question_spec.rb @@ -101,7 +101,7 @@ RSpec.describe Form::Question, type: :model do it "has an answer label" do case_log.earnings = 100 - expect(subject.answer_label(case_log)).to eq("100.0") + expect(subject.answer_label(case_log)).to eq("100") end it "has an update answer link text helper" do