resolved user.rb conflict

[rails.git] / db / migrate.sql

diff --git a/db/migrate.sql b/db/migrate.sql
index a884156d4eaac4b148504b58b117532a2f7e1a27..302ad2a6ccfef0b5cb8cbd1184b6e0ab05e1a16d 100644 (file)
--- a/db/migrate.sql
+++ b/db/migrate.sql
@@ -30,5 +30,22 @@ alter table gpx_file_tags add id int(20) auto_increment not null, add primary ke
 alter table users add preferences text;
 create index users_display_name_idx on users(display_name);
 
-alter table users add public boolean default false;
+alter table users add data_public boolean default false;
 
+alter table gpx_files drop column tmpname;
+
+alter table users add column description text not null;
+create table diary_entries(id bigint not null auto_increment, user_id bigint not null, title varchar(255), body text, primary key(id));
+alter table diary_entries add created_at datetime;
+alter table diary_entries add updated_at datetime;
+
+alter table users add column (home_lat double default 0);
+alter table users add column (home_lon double default 0);
+alter table users add column home_zoom int(2) default 3);
+alter table users add column within_lon double default 2;
+alter table users add column within_lat double default 2;
+
+create table messages (id bigint not null auto_increment, user_id bigint(20) not null,  from_user_id bigint(20) not null, title varchar(255), body text, sent_on datetime, message_read boolean default 0, primary key(id));
+
+create table friends (id bigint not null auto_increment, user_id bigint(20) not null, friend_user_id(20) not null, primary key(id));
+create index user_id_idx on friends(friend_user_id);