From b1e3cf62438429e7e899616e4502179e0213d1c1 Mon Sep 17 00:00:00 2001 From: Savannah Date: Mon, 9 Mar 2015 13:12:24 -0400 Subject: [PATCH 1/6] added irc.sql, just creates basic user and message tables --- irc.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 irc.sql diff --git a/irc.sql b/irc.sql new file mode 100644 index 0000000..307ae6c --- /dev/null +++ b/irc.sql @@ -0,0 +1,19 @@ +DROP DATABASE IF EXISTS irc_db; +CREATE DATABASE irc_db; +\c irc_db; + +CREATE TABLE IF NOT EXISTS users ( + id serial, + username varchar(30), + password varchar(30), + PRIMARY KEY (id) +); + + +CREATE TABLE IF NOT EXISTS messages ( + message_id serial, + original_poster_id int NOT NULL, + message_content binary, + PRIMARY KEY (message_id) +); + From 53d0fec3ac0e42756fff3fdb1f7c7f74492ff06b Mon Sep 17 00:00:00 2001 From: Michelle Date: Mon, 9 Mar 2015 17:25:30 +0000 Subject: [PATCH 2/6] A file to help with commands in postgresql --- postgreSQLCommands.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 postgreSQLCommands.txt diff --git a/postgreSQLCommands.txt b/postgreSQLCommands.txt new file mode 100644 index 0000000..b9a21b8 --- /dev/null +++ b/postgreSQLCommands.txt @@ -0,0 +1,17 @@ +Command cheat sheet + +change column name +ALTER TABLE [tablename] RENAME COLUMN [oldname] TO [newname]; + +copy table +CREATE TABLE [newtablename] AS SELECT [columns] FROM [existing]; + +change column data type +ALTER TABLE[tablename] ALTER COLUMN [columnname] TYPE [newtype]; + + +insert +INSERT INTO [tablename] VALUES ([value1],[value2], ... ); + +update +UPDATE [tablename] SET [column1]=[value1] ... WHERE [somecolumn] = [somevalue]; From 93ae88d23570bc4c97c9e3ecb064b8b3148053cd Mon Sep 17 00:00:00 2001 From: Savannah Date: Mon, 9 Mar 2015 13:26:58 -0400 Subject: [PATCH 3/6] changed binary to varchar(200) in message table --- irc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc.sql b/irc.sql index 307ae6c..6f6b80e 100644 --- a/irc.sql +++ b/irc.sql @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS users ( CREATE TABLE IF NOT EXISTS messages ( message_id serial, original_poster_id int NOT NULL, - message_content binary, + message_content varchar(200), PRIMARY KEY (message_id) ); From 231a7390158cff7e85a155759d3fb3680ff569b7 Mon Sep 17 00:00:00 2001 From: Michelle Date: Mon, 9 Mar 2015 17:42:50 +0000 Subject: [PATCH 4/6] I updated the readme --- README.md | 11 +++++++++++ server.py | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 41e1f2c..5d2adf4 100644 --- a/README.md +++ b/README.md @@ -35,3 +35,14 @@ Welcome to your IRC project on Cloud9 IDE! ### You must host your code on github +Things to check if it isn't working. +Did we git add the file? +Did we git commit the file? +Did we git push? +Onto the right branch? +Did you do a pull request? +Did I merge it on github? +Did I actually pull it? + + + diff --git a/server.py b/server.py index dcb0644..1a159db 100644 --- a/server.py +++ b/server.py @@ -32,7 +32,6 @@ def test_connect(): users[session['uuid']]={'username':'New User'} updateRoster() - for message in messages: emit('message', message) From f7be5ba760c04ce9cff85777f3c268e903072c8f Mon Sep 17 00:00:00 2001 From: Savannah Date: Mon, 9 Mar 2015 13:48:41 -0400 Subject: [PATCH 5/6] replaced varchar to bytea in irc.sql --- irc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc.sql b/irc.sql index 6f6b80e..7c0ba1d 100644 --- a/irc.sql +++ b/irc.sql @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS users ( CREATE TABLE IF NOT EXISTS messages ( message_id serial, original_poster_id int NOT NULL, - message_content varchar(200), + message_content bytea, PRIMARY KEY (message_id) ); From e5b96524a50e3bd771d149c4b63721140101358e Mon Sep 17 00:00:00 2001 From: Michelle Date: Mon, 9 Mar 2015 19:28:36 +0000 Subject: [PATCH 6/6] This is the updated irc.sql file with two default users. --- README.md | 3 +-- irc.sql | 5 ++++- server.py | 10 ++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5d2adf4..36ac524 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,11 @@ Welcome to your IRC project on Cloud9 IDE! ### You must host your code on github - +# Things to check if it isn't working. Did we git add the file? Did we git commit the file? Did we git push? -Onto the right branch? Did you do a pull request? Did I merge it on github? Did I actually pull it? diff --git a/irc.sql b/irc.sql index 7c0ba1d..3076d76 100644 --- a/irc.sql +++ b/irc.sql @@ -9,11 +9,14 @@ CREATE TABLE IF NOT EXISTS users ( PRIMARY KEY (id) ); +INSERT INTO users (id, username, password) VALUES +(DEFAULT, 'SpiderBall', 'sb'), +(DEFAULT, 'MidnaPeach', 'mp'); CREATE TABLE IF NOT EXISTS messages ( message_id serial, original_poster_id int NOT NULL, - message_content bytea, + message_content bytea NULL, PRIMARY KEY (message_id) ); diff --git a/server.py b/server.py index 1a159db..0a7f234 100644 --- a/server.py +++ b/server.py @@ -13,7 +13,7 @@ def updateRoster(): names = [] - for user_id in users: + for user_id in users: print users[user_id]['username'] if len(users[user_id]['username'])==0: names.append('Anonymous') @@ -23,6 +23,7 @@ def updateRoster(): emit('roster', names, broadcast=True) + @socketio.on('connect', namespace='/chat') def test_connect(): session['uuid']=uuid.uuid1() @@ -35,6 +36,7 @@ def test_connect(): for message in messages: emit('message', message) + @socketio.on('message', namespace='/chat') def new_message(message): #tmp = {'text':message, 'name':'testName'} @@ -42,6 +44,8 @@ def new_message(message): messages.append(tmp) emit('message', tmp, broadcast=True) + + @socketio.on('identify', namespace='/chat') def on_identify(message): print 'identify' + message @@ -52,10 +56,12 @@ def on_identify(message): @socketio.on('login', namespace='/chat') def on_login(pw): print 'login ' + pw + #we need to connect here.? + + #users[session['uuid']]={'username':message} #updateRoster() - @socketio.on('disconnect', namespace='/chat') def on_disconnect():