X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=lib%2Fmailshears%2Fplugins%2Fdavical.rb;h=3f4861c3914e44d201442981fa69bb198f3acf9c;hb=d5d01229271c2afa82e90e5bad6f80546b1ae47a;hp=8f6be66959da76d31d6a0e2b26db59ecd613a6f5;hpb=95418256aafd4166ff4791f4aa3f25a8c3b6e556;p=mailshears.git

diff --git a/lib/mailshears/plugins/davical.rb b/lib/mailshears/plugins/davical.rb
index 8f6be66..3f4861c 100644
--- a/lib/mailshears/plugins/davical.rb
+++ b/lib/mailshears/plugins/davical.rb
@@ -1,7 +1,10 @@
 require 'pg'
 
 class DavicalDb
-
+  #
+  # DAViCal only supports Postgres, so even if we ever are
+  # database-agnostic, this plugin can't be.
+  #
   include Plugin
 
   def initialize()
@@ -94,7 +97,7 @@ class DavicalDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT principal_id FROM users WHERE username = $1;"
+      sql_query = "SELECT principal_id FROM usr WHERE username = $1;"
 
       connection.query(sql_query, [account]) do |result|
         if result.num_tuples > 0
@@ -116,7 +119,6 @@ class DavicalDb
   def get_davical_usernames()
     usernames = []
 
-    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -126,7 +128,8 @@ class DavicalDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query  = 'SELECT username FROM usr;'
+      # User #1 is the super-user, and not tied to an email address.
+      sql_query  = 'SELECT username FROM usr WHERE user_no > 1;'
 
       connection.query(sql_query) do |result|
         usernames = result.field_values('username')