Add postgresql support.

Gemfile

@@ -6,7 +6,14 @@ gem 'haml'
 gem 'sass'
 gem 'sequel'
 
-gem 'mysql2'
+group :mysql do
+  gem 'mysql2'
+end
+
+group :postgresql do
+  gem 'pg'
+end
+
 gem 'redis'
 gem 'em-hiredis'
 

Gemfile.lock

@@ -13,6 +13,7 @@ GEM
     hiredis (0.5.2)
     multi_json (1.10.1)
     mysql2 (0.3.16)
+    pg (0.18.4)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
@@ -46,6 +47,7 @@ DEPENDENCIES
   em-hiredis
   haml
   mysql2
+  pg
   redis
   sass
   sequel

README.md

@@ -17,6 +17,7 @@ Installation
 
   1. Make sure all dependencies are installed and configured.
   2. Create a MySQL database and import the schema from `config/sql/mysql-schema.sql`, or, create a PostgreSQL database and import the schema from `config/sql/postgresql-schema.sql`.
+  3. Run `bundle install --without postgresql` if you use MySQL, or `bundle install --without mysql` if you use PostgreSQL.
   3. Copy `config/application.yml.example` to `config/application.yml`.
   4. Edit `config/application.yml`. The fields should be self-documenting.
   6. Copy `config/nginx.conf.example` to `/etc/nginx/sites-enabled/irclogger`. Edit the `server_name`, `root` and `upstream` directives to match your setup.

config/application.yml.example

@@ -1,5 +1,6 @@
 ---
 database: mysql2://root@localhost/irclogs
+# database: postgres:///irclogs
 redis: redis://localhost:6379
 
 server: irc.freenode.net
@@ -8,4 +9,4 @@ realname: whitequark's logger bot
 nickname: logger_test
 channels:
   - "#irclogger-test"
-domain: example.com
+domain: example.com

config/sql/postgresql-schema.sql

@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS irclog;
+CREATE TABLE irclog (
+        id SERIAL,
+        channel VARCHAR(30),
+        nick VARCHAR(40),
+        opcode VARCHAR(20),
+        timestamp INT,
+        line TEXT,
+        oper_nick VARCHAR(40),
+        payload TEXT,
+        PRIMARY KEY(id)
+);
+
+CREATE INDEX irclog_channel_timestamp_index ON irclog (channel, timestamp);
+CREATE INDEX irclog_channel_opcode_index ON irclog (channel, opcode);
+CREATE INDEX irclog_channel_nick_index ON irclog (channel, nick);
+CREATE INDEX irclog_fulltext_index ON irclog
+  USING gin(to_tsvector('english', nick || ' ' || line));

lib/irclogger/message.rb

@@ -94,9 +94,17 @@ def self.find_by_channel_and_kickban(channel, query)
   end
 
   def self.find_by_channel_and_fulltext(channel, query)
-    order(:timestamp).reverse.filter(:channel => channel).
-        filter('opcode is null').
-        filter('match (nick, line) against (? in boolean mode)', query)
+    dataset = order(:timestamp).reverse.filter(:channel => channel).
+        filter('opcode is null')
+    case DB.database_type
+    when :mysql2
+      dataset.filter('match (nick, line) against (? in boolean mode)', query)
+    when :postgres
+      dataset.filter("to_tsvector('english', nick || ' ' || line) @@ " \
+                     "plainto_tsquery('english', ?)", query)
+    else
+      raise NotImplementedError
+    end
   end
 
   def self.find_by_channel_and_nick(channel, query)

views/help/search.haml

@@ -3,11 +3,12 @@
     How to search:
 
     %ul
-      %li
-        You can use standard <a href='http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html'>MySQL fulltext search</a> operations.
+      - if DB.database_type == :mysql2
+        %li
+          You can use standard <a href='http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html'>MySQL fulltext search</a> operations.
 
       %li
         You can fetch a history of kicks and bans of a particular user by searching for "kickban:username".
 
       %li
-        You can fetch a list of all messages by a particular user by searching for "nick:username".
+        You can fetch a list of all messages by a particular user by searching for "nick:username".