From 04d8648c6db0802d1bc4613c9591d30803859645 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Sun, 28 Oct 2012 18:03:19 +1100 Subject: [PATCH] Remove pickup address and use single address field for supplier and distributor roles within enterprise --- .../20121028070200_remove_pickup_address_from_enterprises.rb | 5 +++++ db/schema.rb | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20121028070200_remove_pickup_address_from_enterprises.rb diff --git a/db/migrate/20121028070200_remove_pickup_address_from_enterprises.rb b/db/migrate/20121028070200_remove_pickup_address_from_enterprises.rb new file mode 100644 index 0000000000..2aa38222b4 --- /dev/null +++ b/db/migrate/20121028070200_remove_pickup_address_from_enterprises.rb @@ -0,0 +1,5 @@ +class RemovePickupAddressFromEnterprises < ActiveRecord::Migration + def change + remove_column :enterprises, :pickup_address_id + end +end diff --git a/db/schema.rb b/db/schema.rb index b1555598df..7863a818d1 100644 --- 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. -ActiveRecord::Schema.define(:version => 20121025012233) do +ActiveRecord::Schema.define(:version => 20121028070200) do create_table "cms_blocks", :force => true do |t| t.integer "page_id", :null => false @@ -162,7 +162,6 @@ ActiveRecord::Schema.define(:version => 20121025012233) do t.string "acn" t.integer "address_id" t.string "pickup_times" - t.integer "pickup_address_id" t.string "next_collection_at" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false