Merge branch 'master' of /pichat/repo

1 files changed, 4 insertions, 8 deletions

diff --git a/db/0-create.psql b/db/0-create.psql
index 3479159..649d74f 100644
--- a/db/0-create.psql
+++ b/db/0-create.psql
@@ -21,13 +21,6 @@ ALTER TABLE users ADD CONSTRAINT users_nick_constraint UNIQUE (LOWER(nick));
 
 CREATE INDEX users_nick_lowercase_idx ON users (lower(nick));
 
---    ALTER TABLE users
---    ADD COLUMN last_login timestamp;
---    ALTER TABLE users
---    ADD COLUMN created_ip cidr DEFAULT '0';
---    ALTER TABLE users
---    ADD COLUMN last_ip cidr DEFAULT '0';
-
 CREATE TABLE rooms (
     room_id SERIAL PRIMARY KEY,
     key text UNIQUE NOT NULL,
@@ -35,9 +28,12 @@ CREATE TABLE rooms (
     description text NOT NULL,
     created_on timestamp NOT NULL DEFAULT now(),
     admin_only bool NOT NULL DEFAULT false,
-    active bool NOT NULL DEFAULT true
+    active bool NOT NULL DEFAULT true,
+    history_size integer NOT NULL DEFAULT 25
 );
 
+-- ALTER TABLE rooms ADD COLUMN history_size integer NOT NULL DEFAULT 25;
+
 CREATE TABLE messages (
     message_id SERIAL PRIMARY KEY,
     user_id integer NOT NULL REFERENCES users,