From 1ba26fd111a0407f83d0c2cfe29dcff7f965f841 Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Sun, 31 May 2015 20:48:10 +0200 Subject: [PATCH 1/5] Create 201505312045_rename_email_settings.rb Refactoring of email_settings for #603 --- .../201505312045_rename_email_settings.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 db/migrate/201505312045_rename_email_settings.rb diff --git a/db/migrate/201505312045_rename_email_settings.rb b/db/migrate/201505312045_rename_email_settings.rb new file mode 100644 index 00000000..288f87a2 --- /dev/null +++ b/db/migrate/201505312045_rename_email_settings.rb @@ -0,0 +1,19 @@ +class FixColumnNames < ActiveRecord::Migration + def up + change_table :email_settings do |t| + t.rename :registration_email_template, :registration_body + t.rename :accepted_email_template, :accepted_body + t.rename :rejected_email_template, :rejected_body + t.rename :confirmed_email_template, :confirmed_body + end + end + + def down + change_table :email_settings do |t| + t.rename :registration_body, :registration_email_template + t.rename :accepted_body, :accepted_email_template + t.rename :rejected_body, :rejected_email_template + t.rename :confirmed_body, :confirmed_email_template + end + end +end From 9651c57748ae30991450cc427b39b92e7650278e Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Sun, 31 May 2015 22:03:35 +0200 Subject: [PATCH 2/5] Update 201505312045_rename_email_settings.rb The class has got the name rename_email_settings now. --- db/migrate/201505312045_rename_email_settings.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/migrate/201505312045_rename_email_settings.rb b/db/migrate/201505312045_rename_email_settings.rb index 288f87a2..0a1b3329 100644 --- a/db/migrate/201505312045_rename_email_settings.rb +++ b/db/migrate/201505312045_rename_email_settings.rb @@ -1,10 +1,10 @@ -class FixColumnNames < ActiveRecord::Migration +class rename_email_settings < ActiveRecord::Migration def up change_table :email_settings do |t| t.rename :registration_email_template, :registration_body t.rename :accepted_email_template, :accepted_body - t.rename :rejected_email_template, :rejected_body - t.rename :confirmed_email_template, :confirmed_body + t.rename :rejected_email_template, :rejected_body + t.rename :confirmed_email_template, :confirmed_body end end @@ -12,8 +12,8 @@ class FixColumnNames < ActiveRecord::Migration change_table :email_settings do |t| t.rename :registration_body, :registration_email_template t.rename :accepted_body, :accepted_email_template - t.rename :rejected_body, :rejected_email_template - t.rename :confirmed_body, :confirmed_email_template + t.rename :rejected_body, :rejected_email_template + t.rename :confirmed_body, :confirmed_email_template end end end From 53a8627bba8a91e7830ca00ea689509a2f7e5ecb Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Sun, 31 May 2015 22:22:37 +0200 Subject: [PATCH 3/5] Update 201505312045_rename_email_settings.rb --- db/migrate/201505312045_rename_email_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/201505312045_rename_email_settings.rb b/db/migrate/201505312045_rename_email_settings.rb index 0a1b3329..59de9f15 100644 --- a/db/migrate/201505312045_rename_email_settings.rb +++ b/db/migrate/201505312045_rename_email_settings.rb @@ -1,4 +1,4 @@ -class rename_email_settings < ActiveRecord::Migration +class RenameEmailSettings < ActiveRecord::Migration def up change_table :email_settings do |t| t.rename :registration_email_template, :registration_body From a31d0bf9f5df8fb4edd224ce53b5280a7554c740 Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Sun, 31 May 2015 22:39:47 +0200 Subject: [PATCH 4/5] Update 201505312045_rename_email_settings.rb without a loop and wit rename_column like in http://api.rubyonrails.org/classes/ActiveRecord/Migration.html --- .../201505312045_rename_email_settings.rb | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/db/migrate/201505312045_rename_email_settings.rb b/db/migrate/201505312045_rename_email_settings.rb index 59de9f15..f0f56bcd 100644 --- a/db/migrate/201505312045_rename_email_settings.rb +++ b/db/migrate/201505312045_rename_email_settings.rb @@ -1,19 +1,15 @@ class RenameEmailSettings < ActiveRecord::Migration def up - change_table :email_settings do |t| - t.rename :registration_email_template, :registration_body - t.rename :accepted_email_template, :accepted_body - t.rename :rejected_email_template, :rejected_body - t.rename :confirmed_email_template, :confirmed_body - end + rename_column(:email_settings, :registration_email_template, :registration_body) + rename_column(:email_settings, :accepted_email_template, :accepted_body) + rename_column(:email_settings, :rejected_email_template, :rejected_body) + rename_column(:email_settings, :confirmed_email_template, :confirmed_body) end def down - change_table :email_settings do |t| - t.rename :registration_body, :registration_email_template - t.rename :accepted_body, :accepted_email_template - t.rename :rejected_body, :rejected_email_template - t.rename :confirmed_body, :confirmed_email_template - end + rename_column(:email_settings, :registration_body, :registration_email_template) + rename_column(:email_settings, :accepted_body, :accepted_email_template) + rename_column(:email_settings, :rejected_body, :rejected_email_template) + rename_column(:email_settings, :confirmed_body, :confirmed_email_template) end end From 01edcb37c984bcb76ea5716ab46b028ddbd69318 Mon Sep 17 00:00:00 2001 From: chrisbr Date: Mon, 1 Jun 2015 11:17:37 +0200 Subject: [PATCH 5/5] Add schema changes --- db/schema.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 086a703f..4f0198d2 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: 20150415121038) do +ActiveRecord::Schema.define(version: 20150417050953) do create_table "ahoy_events", force: true do |t| t.uuid "visit_id" @@ -21,6 +21,7 @@ ActiveRecord::Schema.define(version: 20150415121038) do t.datetime "time" end + add_index "ahoy_events", ["id"], name: "sqlite_autoindex_ahoy_events_1", unique: true add_index "ahoy_events", ["time"], name: "index_ahoy_events_on_time" add_index "ahoy_events", ["user_id"], name: "index_ahoy_events_on_user_id" add_index "ahoy_events", ["visit_id"], name: "index_ahoy_events_on_visit_id" @@ -162,10 +163,10 @@ ActiveRecord::Schema.define(version: 20150415121038) do t.boolean "send_on_accepted", default: false t.boolean "send_on_rejected", default: false t.boolean "send_on_confirmed_without_registration", default: false - t.text "registration_email_template" - t.text "accepted_email_template" - t.text "rejected_email_template" - t.text "confirmed_email_template" + t.text "registration_body" + t.text "accepted_body" + t.text "rejected_body" + t.text "confirmed_body" t.datetime "created_at" t.datetime "updated_at" t.string "registration_subject" @@ -558,6 +559,7 @@ ActiveRecord::Schema.define(version: 20150415121038) do t.datetime "started_at" end + add_index "visits", ["id"], name: "sqlite_autoindex_visits_1", unique: true add_index "visits", ["user_id"], name: "index_visits_on_user_id" create_table "votes", force: true do |t|