Merge 98e0a25606 into a925ceac35

db/migrate/20170516190048_create_booths.rb

@@ -0,0 +1,14 @@
+class CreateBooths < ActiveRecord::Migration
+  def change
+    create_table :booths do |t|
+      t.string :title
+      t.text :description
+      t.text :reasoning
+      t.string :state
+      t.string :logo_link
+      t.integer :conference_id
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20170530112510_create_booth_requests.rb

@@ -0,0 +1,11 @@
+class CreateBoothRequests < ActiveRecord::Migration
+  def change
+    create_table :booth_requests do |t|
+      t.references :booth, index: true, foreign_key: true
+      t.references :user, index: true, foreign_key: true
+      t.string :role
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20170606182954_create_call_for_booths.rb

@@ -0,0 +1,12 @@
+class CreateCallForBooths < ActiveRecord::Migration
+  def change
+    create_table :call_for_booths do |t|
+      t.date :start_date
+      t.date :end_date
+      t.integer :booth_limit
+      t.references :conference
+
+      t.timestamps null: false
+    end
+  end
+end

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: 20170531094819) do
+ActiveRecord::Schema.define(version: 20170606182954) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -34,6 +34,37 @@ ActiveRecord::Schema.define(version: 20170531094819) do
     t.datetime "updated_at"
   end
 
+  create_table "booth_requests", force: :cascade do |t|
+    t.integer  "booth_id"
+    t.integer  "user_id"
+    t.string   "role"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "booth_requests", ["booth_id"], name: "index_booth_requests_on_booth_id"
+  add_index "booth_requests", ["user_id"], name: "index_booth_requests_on_user_id"
+
+  create_table "booths", force: :cascade do |t|
+    t.string   "title"
+    t.text     "description"
+    t.text     "reasoning"
+    t.string   "state"
+    t.string   "logo_link"
+    t.integer  "conference_id"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
+  create_table "call_for_booths", force: :cascade do |t|
+    t.date     "start_date"
+    t.date     "end_date"
+    t.integer  "booth_limit"
+    t.integer  "conference_id"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
   create_table "campaigns", force: :cascade do |t|
     t.integer  "conference_id"
     t.string   "name"