summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-01 20:23:29 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-01 20:23:29 -0500
commit2eb242f3e5b1f1ab66d84556cabcad965fe387aa (patch)
treed80e7422f39ef2b49801dbefd586e8e48500e43b /db
parent318d7649200fd51c7b1582c3f93534de9f2a3cf5 (diff)
changed the user section of the generate
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20140304015527_create_servers.rb (renamed from db/migrate/20140304015447_create_servers.rb)0
-rw-r--r--db/migrate/20140304015530_create_tournaments.rb (renamed from db/migrate/20140304015449_create_tournaments.rb)0
-rw-r--r--db/migrate/20140304015532_create_matches.rb (renamed from db/migrate/20140304015452_create_matches.rb)0
-rw-r--r--db/migrate/20140304015534_create_teams.rb (renamed from db/migrate/20140304015454_create_teams.rb)0
-rw-r--r--db/migrate/20140304015538_create_users.rb (renamed from db/migrate/20140304015456_create_users.rb)6
-rw-r--r--db/migrate/20140304015540_create_user_team_pairs.rb (renamed from db/migrate/20140304015458_create_user_team_pairs.rb)0
-rw-r--r--db/migrate/20140304015542_create_team_match_pairs.rb (renamed from db/migrate/20140304015500_create_team_match_pairs.rb)0
-rw-r--r--db/migrate/20140304015544_create_alerts.rb (renamed from db/migrate/20140304015502_create_alerts.rb)0
-rw-r--r--db/migrate/20140304015547_create_pms.rb (renamed from db/migrate/20140304015505_create_pms.rb)0
-rw-r--r--db/migrate/20140304015549_create_games.rb (renamed from db/migrate/20140304015507_create_games.rb)0
-rw-r--r--db/migrate/20140304015551_create_game_attributes.rb (renamed from db/migrate/20140304015509_create_game_attributes.rb)0
-rw-r--r--db/migrate/20140304015553_create_server_settings.rb (renamed from db/migrate/20140304015511_create_server_settings.rb)0
-rw-r--r--db/migrate/20140304015559_create_tournament_options.rb (renamed from db/migrate/20140304015517_create_tournament_options.rb)0
-rw-r--r--db/schema.rb8
14 files changed, 7 insertions, 7 deletions
diff --git a/db/migrate/20140304015447_create_servers.rb b/db/migrate/20140304015527_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015447_create_servers.rb
+++ b/db/migrate/20140304015527_create_servers.rb
diff --git a/db/migrate/20140304015449_create_tournaments.rb b/db/migrate/20140304015530_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015449_create_tournaments.rb
+++ b/db/migrate/20140304015530_create_tournaments.rb
diff --git a/db/migrate/20140304015452_create_matches.rb b/db/migrate/20140304015532_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015452_create_matches.rb
+++ b/db/migrate/20140304015532_create_matches.rb
diff --git a/db/migrate/20140304015454_create_teams.rb b/db/migrate/20140304015534_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015454_create_teams.rb
+++ b/db/migrate/20140304015534_create_teams.rb
diff --git a/db/migrate/20140304015456_create_users.rb b/db/migrate/20140304015538_create_users.rb
index 6a500e5..f0986d4 100644
--- a/db/migrate/20140304015456_create_users.rb
+++ b/db/migrate/20140304015538_create_users.rb
@@ -1,9 +1,9 @@
class CreateUsers < ActiveRecord::Migration
def change
create_table :users do |t|
- t.text :name
- t.text :pw_hash
- t.integer :groups
+ t.string :name
+ t.string :email
+ t.string :user_name
t.timestamps
end
diff --git a/db/migrate/20140304015458_create_user_team_pairs.rb b/db/migrate/20140304015540_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015458_create_user_team_pairs.rb
+++ b/db/migrate/20140304015540_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015500_create_team_match_pairs.rb b/db/migrate/20140304015542_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015500_create_team_match_pairs.rb
+++ b/db/migrate/20140304015542_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015502_create_alerts.rb b/db/migrate/20140304015544_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015502_create_alerts.rb
+++ b/db/migrate/20140304015544_create_alerts.rb
diff --git a/db/migrate/20140304015505_create_pms.rb b/db/migrate/20140304015547_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015505_create_pms.rb
+++ b/db/migrate/20140304015547_create_pms.rb
diff --git a/db/migrate/20140304015507_create_games.rb b/db/migrate/20140304015549_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015507_create_games.rb
+++ b/db/migrate/20140304015549_create_games.rb
diff --git a/db/migrate/20140304015509_create_game_attributes.rb b/db/migrate/20140304015551_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015509_create_game_attributes.rb
+++ b/db/migrate/20140304015551_create_game_attributes.rb
diff --git a/db/migrate/20140304015511_create_server_settings.rb b/db/migrate/20140304015553_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015511_create_server_settings.rb
+++ b/db/migrate/20140304015553_create_server_settings.rb
diff --git a/db/migrate/20140304015517_create_tournament_options.rb b/db/migrate/20140304015559_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015517_create_tournament_options.rb
+++ b/db/migrate/20140304015559_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 41dac9e..7d4d50e 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: 20140304015517) do
+ActiveRecord::Schema.define(version: 20140304015559) do
create_table "alerts", force: true do |t|
t.integer "author_id"
@@ -110,9 +110,9 @@ ActiveRecord::Schema.define(version: 20140304015517) do
add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id"
create_table "users", force: true do |t|
- t.text "name"
- t.text "pw_hash"
- t.integer "groups"
+ t.string "name"
+ t.string "email"
+ t.string "user_name"
t.datetime "created_at"
t.datetime "updated_at"
end