Ready to merge

This commit is contained in:
Godwin
2015-08-21 19:29:43 -07:00
parent 8a05ac6e31
commit 43ab36071b
114 changed files with 27273 additions and 848 deletions
@@ -0,0 +1,7 @@
class AddInfoToRegistrations < ActiveRecord::Migration
def change
add_column :conference_registrations, :allergies, :string
add_column :conference_registrations, :languages, :string
add_column :conference_registrations, :food, :string
end
end
@@ -0,0 +1,5 @@
class MakeUsernameNotNullable < ActiveRecord::Migration
def change
change_column :users, :username, :string, :null => false
end
end
@@ -0,0 +1,5 @@
class MakeUsernameActuallyNotNullable < ActiveRecord::Migration
def change
change_column :users, :username, :string, :null => true
end
end
@@ -0,0 +1,22 @@
class CreateDelayedJobs < ActiveRecord::Migration
def self.up
create_table :delayed_jobs, force: true do |table|
table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
table.text :handler, null: false # YAML-encoded string of the object that will do work
table.text :last_error # reason for last failure (See Note below)
table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future.
table.datetime :locked_at # Set when a client is working on this object
table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead)
table.string :locked_by # Who is working on this object (if locked)
table.string :queue # The name of the queue this job is in
table.timestamps null: true
end
add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
end
def self.down
drop_table :delayed_jobs
end
end
@@ -0,0 +1,9 @@
class AddLanguagesToWorkshops < ActiveRecord::Migration
def change
add_column :workshops, :languages, :string
add_column :workshops, :needs, :string
add_column :workshops, :space, :string
add_column :workshops, :theme, :string
add_column :workshops, :host_info, :text
end
end
@@ -0,0 +1,5 @@
class AddNotesToWorkshops < ActiveRecord::Migration
def change
add_column :workshops, :notes, :text
end
end
+106 -81
View File
@@ -11,15 +11,15 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150804032547) do
ActiveRecord::Schema.define(version: 20150821005002) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
create_table "authentications", force: :cascade do |t|
t.integer "user_id", null: false
t.string "provider", null: false
t.string "uid", null: false
t.integer "user_id", null: false
t.string "provider", limit: 255, null: false
t.string "uid", limit: 255, null: false
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -58,19 +58,19 @@ ActiveRecord::Schema.define(version: 20150804032547) do
create_table "conference_registrations", force: :cascade do |t|
t.integer "conference_id"
t.integer "user_id"
t.string "is_attending"
t.string "is_attending", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "is_confirmed"
t.boolean "is_participant"
t.boolean "is_volunteer"
t.string "confirmation_token"
t.string "confirmation_token", limit: 255
t.binary "data"
t.string "email"
t.string "email", limit: 255
t.boolean "complete"
t.boolean "completed"
t.string "payment_confirmation_token"
t.string "payment_info"
t.string "payment_confirmation_token", limit: 255
t.string "payment_info", limit: 255
t.integer "registration_fees_paid"
t.string "city"
t.datetime "arrival"
@@ -78,24 +78,27 @@ ActiveRecord::Schema.define(version: 20150804032547) do
t.string "housing"
t.string "bike"
t.text "other"
t.string "allergies"
t.string "languages"
t.string "food"
end
create_table "conference_types", force: :cascade do |t|
t.string "title"
t.string "info"
t.string "title", limit: 255
t.string "info", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
t.string "slug"
t.string "slug", limit: 255
end
create_table "conferences", force: :cascade do |t|
t.string "title"
t.string "slug"
t.string "title", limit: 255
t.string "slug", limit: 255
t.datetime "start_date"
t.datetime "end_date"
t.text "info"
t.string "poster"
t.string "cover"
t.string "poster", limit: 255
t.string "cover", limit: 255
t.boolean "workshop_schedule_published"
t.boolean "registration_open"
t.boolean "meals_provided"
@@ -108,8 +111,8 @@ ActiveRecord::Schema.define(version: 20150804032547) do
t.text "registration_info"
t.text "postregistration_info"
t.integer "cover_attribution_id"
t.string "cover_attribution_name"
t.string "cover_attribution_src"
t.string "cover_attribution_name", limit: 255
t.string "cover_attribution_src", limit: 255
t.integer "cover_attribution_user_id"
t.string "locale"
t.string "email_address"
@@ -119,6 +122,22 @@ ActiveRecord::Schema.define(version: 20150804032547) do
t.string "paypal_signature"
end
create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false
t.text "handler", null: false
t.text "last_error"
t.datetime "run_at"
t.datetime "locked_at"
t.datetime "failed_at"
t.string "locked_by"
t.string "queue"
t.datetime "created_at"
t.datetime "updated_at"
end
add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
create_table "dynamic_translation_records", force: :cascade do |t|
t.string "locale"
t.integer "translator_id"
@@ -139,15 +158,15 @@ ActiveRecord::Schema.define(version: 20150804032547) do
end
create_table "event_types", force: :cascade do |t|
t.string "slug"
t.string "slug", limit: 255
t.text "info"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "events", force: :cascade do |t|
t.string "title"
t.string "slug"
t.string "title", limit: 255
t.string "slug", limit: 255
t.integer "event_type_id"
t.integer "conference_id"
t.text "info"
@@ -159,16 +178,16 @@ ActiveRecord::Schema.define(version: 20150804032547) do
end
create_table "locations", force: :cascade do |t|
t.string "title"
t.string "title", limit: 255
t.float "latitude"
t.float "longitude"
t.datetime "created_at"
t.datetime "updated_at"
t.string "country"
t.string "territory"
t.string "city"
t.string "street"
t.string "postal_code"
t.string "country", limit: 255
t.string "territory", limit: 255
t.string "city", limit: 255
t.string "street", limit: 255
t.string "postal_code", limit: 255
end
add_index "locations", ["latitude", "longitude"], name: "index_locations_on_latitude_and_longitude", using: :btree
@@ -181,50 +200,50 @@ ActiveRecord::Schema.define(version: 20150804032547) do
add_index "locations_organizations", ["organization_id", "location_id"], name: "loc_org_index", using: :btree
create_table "organization_statuses", force: :cascade do |t|
t.string "name"
t.string "slug"
t.string "info"
t.string "name", limit: 255
t.string "slug", limit: 255
t.string "info", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "organizations", force: :cascade do |t|
t.string "name"
t.string "slug"
t.string "email_address"
t.string "url"
t.string "name", limit: 255
t.string "slug", limit: 255
t.string "email_address", limit: 255
t.string "url", limit: 255
t.integer "year_founded"
t.text "info"
t.string "logo"
t.string "avatar"
t.string "logo", limit: 255
t.string "avatar", limit: 255
t.boolean "requires_approval"
t.string "secret_question"
t.string "secret_answer"
t.string "secret_question", limit: 255
t.string "secret_answer", limit: 255
t.integer "user_organization_replationship_id"
t.datetime "created_at"
t.datetime "updated_at"
t.string "cover"
t.string "cover", limit: 255
t.integer "cover_attribution_id"
t.string "cover_attribution_name"
t.string "cover_attribution_src"
t.string "phone"
t.string "cover_attribution_name", limit: 255
t.string "cover_attribution_src", limit: 255
t.string "phone", limit: 255
t.integer "organization_status_id"
t.integer "cover_attribution_user_id"
end
create_table "registration_form_fields", force: :cascade do |t|
t.string "title"
t.string "title", limit: 255
t.text "help"
t.boolean "required"
t.string "field_type"
t.string "options"
t.string "field_type", limit: 255
t.string "options", limit: 255
t.boolean "is_retired"
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "sessions", force: :cascade do |t|
t.string "session_id", null: false
t.string "session_id", limit: 255, null: false
t.text "data"
t.datetime "created_at"
t.datetime "updated_at"
@@ -242,11 +261,11 @@ ActiveRecord::Schema.define(version: 20150804032547) do
end
create_table "translations", force: :cascade do |t|
t.string "locale"
t.string "key"
t.string "locale", limit: 255
t.string "key", limit: 255
t.text "value"
t.text "interpolations"
t.boolean "is_proc", default: false
t.boolean "is_proc", default: false
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -254,34 +273,34 @@ ActiveRecord::Schema.define(version: 20150804032547) do
create_table "user_organization_relationships", force: :cascade do |t|
t.integer "user_id"
t.integer "organization_id"
t.string "relationship"
t.string "relationship", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "users", force: :cascade do |t|
t.string "username", null: false
t.string "email"
t.string "crypted_password"
t.string "salt"
t.string "username"
t.string "email", limit: 255
t.string "crypted_password", limit: 255
t.string "salt", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
t.string "remember_me_token"
t.string "remember_me_token", limit: 255
t.datetime "remember_me_token_expires_at"
t.string "reset_password_token"
t.string "reset_password_token", limit: 255
t.datetime "reset_password_token_expires_at"
t.datetime "reset_password_email_sent_at"
t.string "activation_state"
t.string "activation_token"
t.string "activation_state", limit: 255
t.string "activation_token", limit: 255
t.datetime "activation_token_expires_at"
t.integer "failed_logins_count", default: 0
t.integer "failed_logins_count", default: 0
t.datetime "lock_expires_at"
t.string "unlock_token"
t.string "avatar"
t.string "unlock_token", limit: 255
t.string "avatar", limit: 255
t.text "about_me"
t.string "role"
t.string "firstname"
t.string "lastname"
t.string "role", limit: 255
t.string "firstname", limit: 255
t.string "lastname", limit: 255
t.boolean "is_translator"
end
@@ -290,27 +309,27 @@ ActiveRecord::Schema.define(version: 20150804032547) do
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", using: :btree
create_table "versions", force: :cascade do |t|
t.string "item_type"
t.string "item_type", limit: 255
t.integer "item_id"
t.string "event"
t.string "whodunnit"
t.string "event", limit: 255
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
t.string "value"
t.string "value", limit: 255
end
create_table "workshop_facilitators", force: :cascade do |t|
t.integer "user_id"
t.integer "workshop_id"
t.string "role"
t.string "role", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "workshop_presentation_styles", force: :cascade do |t|
t.string "name"
t.string "slug"
t.string "info"
t.string "name", limit: 255
t.string "slug", limit: 255
t.string "info", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
t.integer "order"
@@ -319,31 +338,31 @@ ActiveRecord::Schema.define(version: 20150804032547) do
create_table "workshop_requested_resources", force: :cascade do |t|
t.integer "workshop_id"
t.integer "workshop_resource_id"
t.string "status"
t.string "status", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "workshop_resources", force: :cascade do |t|
t.string "name"
t.string "slug"
t.string "info"
t.string "name", limit: 255
t.string "slug", limit: 255
t.string "info", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "workshop_streams", force: :cascade do |t|
t.string "name"
t.string "slug"
t.string "info"
t.string "name", limit: 255
t.string "slug", limit: 255
t.string "info", limit: 255
t.datetime "created_at"
t.datetime "updated_at"
t.integer "order"
end
create_table "workshops", force: :cascade do |t|
t.string "title"
t.string "slug"
t.string "title", limit: 255
t.string "slug", limit: 255
t.text "info"
t.integer "conference_id"
t.integer "workshop_stream_id"
@@ -354,6 +373,12 @@ ActiveRecord::Schema.define(version: 20150804032547) do
t.datetime "end_time"
t.datetime "created_at"
t.datetime "updated_at"
t.string "languages"
t.string "needs"
t.string "space"
t.string "theme"
t.text "host_info"
t.text "notes"
end
end