From 4ea02cf5b2438f2046ae0ce2690997a9e28effca Mon Sep 17 00:00:00 2001
From: loos <louisknapp@gmail.com>
Date: Fri, 14 Feb 2014 09:29:45 -0600
Subject: [PATCH] fix type column name

---
 app/views/bikes/._form.html.erb.swp           | Bin 0 -> 12288 bytes
 app/views/bikes/_form.html.erb                |   2 +-
 .../.20140118202104_create_bike_table.rb.swp  | Bin 0 -> 12288 bytes
 ...40214152631_change_type_to_bicycle_type.rb |   5 +
 db/schema.rb                                  | 124 +++++++++++++++++-
 5 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 app/views/bikes/._form.html.erb.swp
 create mode 100644 db/migrate/.20140118202104_create_bike_table.rb.swp
 create mode 100644 db/migrate/20140214152631_change_type_to_bicycle_type.rb

diff --git a/app/views/bikes/._form.html.erb.swp b/app/views/bikes/._form.html.erb.swp
new file mode 100644
index 0000000000000000000000000000000000000000..08adf9318732a508378e7a75dbeda8479bb4a596
GIT binary patch
literal 12288
zcmeI2&x;gC6vt~l#+ZnbLvH0H8x(a$UBNh+-4!+BuZYprYg64_JyUE=cT-if?nF^U
zath?4Cp{_N6_1)zLdYK=<RFM(Zn@;DC;e7UyY5Pla}>jC_%Pk|>b<V|OjX0|cD(ES
zu^;%p<_yEJk+JXodvfO5gLLZF7mO|Rib1#ME)-@_8Xq5XoIJ6A|IF^DE)t=~bP3Iu
z*A#5UYEkY?g%h!`vL(v0wWQ<)8`^Cv$_mqO_FP{#rHS8HmSSXp3`{aGaM{jpH?WyK
zyLb7nUp2Py&700m%Az<KAOmE843GgbKnBPF86X4yBLl9SVplMqb=920-vMwwRb9XN
ztS;$;43GgbKnBPF86X2>fDDiUGC&5%02%lQ4TzMn>z^=oaXki)|Np=F{r~)P#{L9%
z!2vK2_JUWRG4>C54E_SYf&1Vd_ys5sgQH+O_!_JS|877Y_ygPqH^Ehqfe6fjFTp18
z@>9m1g1^B-a0}c34*Up?gKxkqjQIt427U*Rz(a5c{0e>seqL7q9b|wEkO4A42FL&z
zAOmFJ0~_c}bD5`ndX914X{Bn(pWt+QmS;^ni2KS_LBx2Xg|)K{kvLW4wlT+iR%}9Y
z$Z&GmMVXR1<?Yg_L{`Zms6{L_Z=Ck+jVdrMIVt+3mi{&o-p;Knb7-XpKa3vjNfnJO
zg)%aY;$h98&Qwtz564#$Mhf0`q8q6^D{87Nh%P^d(AcqzD&&QewkG|QZy%dmX|>WQ
zp`(1zkEN+8ayG>IsSvL#mh@z@7{$dhZ(E`3)SgB2{DjoZNSO>1Elr)yBX6U%g;uW<
z{|a{GhGpGI7SKHY`>2e>MyxF1)eG&QZ=aYgb7zL*7TH0JjeqZZtXgD#(XZMzYc`I*
z80gU^dbeBHSX#~b&DFPEe0QA|E>SK-ruhM{0&kj|!q{du&^qc%YeiSurW8q!rv<-+
z#7m=ZJtX;iv5?O@y*;6HsRu@A^^@GXre0DEa<_vwLixrv)ZnEldMZ{<rrh<E<^J|O
zGew`rQsrH4#ga_hofZm*dvyFWK&7*z8j)NswaA6vq<9pB*{W>qBt$-(_oEHZ6TD0B
PU#K4qYg?F27UuFA09KaR

literal 0
HcmV?d00001

diff --git a/app/views/bikes/_form.html.erb b/app/views/bikes/_form.html.erb
index c58dba6..70ea056 100644
--- a/app/views/bikes/_form.html.erb
+++ b/app/views/bikes/_form.html.erb
@@ -18,7 +18,7 @@
   <%= f.text_field :brand %>
   <br>
   <%= f.label "Type:" %>
-  <%= f.text_field :type %>
+  <%= f.text_field :bike_type %>
   <br>
   <%= f.label "Freecyclery?" %>
   <%= f.check_box :freecyclery %>
diff --git a/db/migrate/.20140118202104_create_bike_table.rb.swp b/db/migrate/.20140118202104_create_bike_table.rb.swp
new file mode 100644
index 0000000000000000000000000000000000000000..c705858fa1f78d6d416a284cd5cba608e624cf51
GIT binary patch
literal 12288
zcmeI2J#W-N5Qg_?r~-%&(JoNuJ|mKtG=YW)(nNs{S?l%KXJzfR)_cH35vlnNY54`z
zbVxKb)YSX{YAVL&d=?jlKImQP^=fBkXV#D9!tzAJmwWqivp*3$ZU}Mp=l6r-PjT<;
zju3}aJ4>hjjde%lYX1e}`Lpfq$*6CvR_20`#{BNDgo7wMqV-sL6{(5_aWu%Y)G1Gc
z@o=;;9F4Zd!|`ai5o$+l4eRibgAMgv^sh4TfdB}s5}5g9eQQlj_?4<%5ANTSw{E^z
zjlvoPKmY_l00ck)1V8`;K;S<n;LDyk<@>v`xX0UzxwkSemY6^Q1V8`;KmY_l00ck)
z1V8`;KmY_TApsQ&@pVmz&1-yk{{P>8|9`tK#AntA)_YdPdc}Im8nf=Qe(|0ktS_vO
ztTWarD`f4lc3F>Db?%2O3=jYT5C8!X009sH0T2KI5CDNoM}Uf0Ncrd5%~JY)<y}^!
zGALc9iDT-~S+&heLq4-b$erKk{f<hNIf}z*E}E^p*V9`s1FzCBD-ye6F07|&X={sD
z<T7Q#VwOkTx!xv<tTm(x8C1%2rI*&k5$U-$<ht5z!o;bZ!YVuN_O&i;jqPf*RzEM#
zhvqgWvph~48adU_tdH4|qQbj*2Wim+-}JxBpzejQWNhV$KjC~aB~njSk&@6xRh4|w
gw9G%|sKdHpUhc?U?X%Z(K-#)E2=<#!dwvSyH)SZw5&!@I

literal 0
HcmV?d00001

diff --git a/db/migrate/20140214152631_change_type_to_bicycle_type.rb b/db/migrate/20140214152631_change_type_to_bicycle_type.rb
new file mode 100644
index 0000000..cb5e08b
--- /dev/null
+++ b/db/migrate/20140214152631_change_type_to_bicycle_type.rb
@@ -0,0 +1,5 @@
+class ChangeTypeToBicycleType < ActiveRecord::Migration
+  def change
+    rename_column(:bikes, :type, :bike_type)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 72e773c..b31ea84 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,16 +11,41 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140118205930) do
+ActiveRecord::Schema.define(version: 20140214152631) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "assignments", force: true do |t|
+    t.integer  "attendee_id"
+    t.integer  "task_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "assignments", ["attendee_id", "task_id"], name: "index_assignments_on_attendee_id_and_task_id", unique: true, using: :btree
+  add_index "assignments", ["attendee_id"], name: "index_assignments_on_attendee_id", using: :btree
+  add_index "assignments", ["task_id"], name: "index_assignments_on_task_id", using: :btree
+
+  create_table "attendees", force: true do |t|
+    t.string   "email"
+    t.integer  "movement_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "event_id"
+    t.string   "name"
+    t.text     "notes"
+    t.boolean  "point_person"
+    t.text     "phone_number"
+  end
+
+  add_index "attendees", ["event_id"], name: "index_attendees_on_event_id", using: :btree
+
   create_table "bikes", force: true do |t|
     t.string   "entry_date"
     t.string   "brand"
     t.string   "model"
-    t.string   "type"
+    t.string   "bike_type"
     t.string   "color"
     t.string   "frame_size"
     t.boolean  "freecyclery"
@@ -35,4 +60,99 @@ ActiveRecord::Schema.define(version: 20140118205930) do
     t.datetime "updated_at"
   end
 
+  create_table "events", force: true do |t|
+    t.string   "name"
+    t.text     "notes"
+    t.string   "address"
+    t.string   "city"
+    t.string   "zip"
+    t.integer  "coordinator_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "movement_id"
+    t.float    "latitude"
+    t.float    "longitude"
+    t.string   "date"
+    t.string   "time"
+    t.string   "location_details"
+    t.string   "event_type"
+    t.boolean  "approved"
+    t.integer  "host_id"
+  end
+
+  add_index "events", ["host_id"], name: "index_events_on_host_id", using: :btree
+  add_index "events", ["movement_id"], name: "index_events_on_movement_id", using: :btree
+
+  create_table "movements", force: true do |t|
+    t.string   "name"
+    t.text     "tagline"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "image_file_name"
+    t.string   "image_content_type"
+    t.integer  "image_file_size"
+    t.datetime "image_updated_at"
+    t.string   "video"
+    t.integer  "user_id"
+    t.text     "call_to_action"
+    t.text     "extended_description"
+    t.boolean  "published",            default: false
+  end
+
+  add_index "movements", ["user_id"], name: "index_movements_on_user_id", using: :btree
+
+  create_table "tasks", force: true do |t|
+    t.string   "description"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "small_event"
+    t.boolean  "medium_event"
+    t.boolean  "big_event"
+    t.integer  "event_id"
+  end
+
+  add_index "tasks", ["event_id"], name: "index_tasks_on_event_id", using: :btree
+
+  create_table "users", force: true do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: ""
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "provider"
+    t.string   "uid"
+    t.string   "name"
+    t.string   "oauth_token"
+    t.datetime "oauth_expires_at"
+    t.string   "invitation_token"
+    t.datetime "invitation_created_at"
+    t.datetime "invitation_sent_at"
+    t.datetime "invitation_accepted_at"
+    t.integer  "invitation_limit"
+    t.integer  "invited_by_id"
+    t.string   "invited_by_type"
+    t.integer  "movement_id"
+  end
+
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree
+  add_index "users", ["invited_by_id"], name: "index_users_on_invited_by_id", using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+
+  create_table "zipcodes", force: true do |t|
+    t.string "zip"
+    t.string "city"
+    t.string "state"
+    t.string "state_abbreviation"
+    t.float  "latitude"
+    t.float  "longitude"
+  end
+
 end