Permalink
Browse files

test

  • Loading branch information...
neilkod committed Jun 21, 2011
1 parent 42da4fa commit 2e53f63e5a57e079e9d2a0dd45f10d618fb21019
Showing with 12 additions and 0 deletions.
  1. +12 −0 load_data.sql
View
@@ -22,12 +22,24 @@ user_id int primary key,
name varchar(100)
);
+<<<<<<< Updated upstream
+=======
+LOAD DATA LOCAL INFILE 'data/sessions.dat' INTO TABLE sessions FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
+LOAD DATA LOCAL INFILE 'data/votes.dat' INTO TABLE votes FIELDS TERMINATED BY '|' (session_id, user_id);
+LOAD DATA LOCAL INFILE 'data/users.dat' INTO TABLE users FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
+
+
+>>>>>>> Stashed changes
create table final_vote_count (
session_id int,
total_votes int
);
+<<<<<<< Updated upstream
LOAD DATA LOCAL INFILE 'sessions.dat' INTO TABLE sessions FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
LOAD DATA LOCAL INFILE 'votes.dat' INTO TABLE votes FIELDS TERMINATED BY '|' (session_id, user_id);
LOAD DATA LOCAL INFILE 'users.dat' INTO TABLE users FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
LOAD DATA LOCAL INFILE 'final_vote_count.dat' INTO TABLE final_vote_count FIELDS TERMINATED BY '|';
+=======
+LOAD DATA LOCAL INFILE 'data/final_vote_count.dat' INTO TABLE final_vote_count FIELDS TERMINATED BY '|';
+>>>>>>> Stashed changes

0 comments on commit 2e53f63

Please sign in to comment.