Update the PostfixadminDb class to use the newer 'pg' module.

[mailshears.git] / src / postfixadmin_db.rb

diff --git a/src/postfixadmin_db.rb b/src/postfixadmin_db.rb
index f4e6feb5c999119535afff82f16ec9d9b83b51cb..0249ea07949b384a5438f34c9c5f7c27e582d7e0 100644 (file)
--- a/src/postfixadmin_db.rb
+++ b/src/postfixadmin_db.rb
@@ -1,4 +1,4 @@
-require 'postgres'
+require 'pg'
 
 class PostfixadminDb
 
@@ -21,6 +21,8 @@ class PostfixadminDb
 
 
   def get_domains_from_db()
+    domains = []
+
     # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
@@ -31,22 +33,24 @@ class PostfixadminDb
                                   @db_user,
                                   @db_pass)
 
-      sql_query = 'SELECT domain FROM domain;'
-      result = connection.query(sql_query)
+      # 'ALL' is a magic domain, and we don't want it.
+      sql_query = "SELECT domain FROM domain WHERE domain <> 'ALL';"
+      connection.query(sql_query) do |result|
+        domains = result.field_values('domain')
+      end
       connection.close()
     rescue PGError => e
       # But pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    # The database query returns an array of rows. Since we only asked
-    # for one column (domain), we can flatten the result into an
-    # array of domains.
-    return result.flatten
+    return domains
   end
 
 
   def get_accounts_from_db()
+    accounts = []
+
     # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
@@ -60,17 +64,16 @@ class PostfixadminDb
       # If address = goto, then the alias basically says, "really
       # deliver to that address; it's not an alias."
       sql_query = 'SELECT username FROM mailbox;'
-      result = connection.query(sql_query)
+      connection.query(sql_query) do |result|
+        accounts = result.field_values('username')
+      end
       connection.close()
     rescue PGError => e
       # But pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    # The database query returns an array of rows. Since we only asked
-    # for one column (address), we can flatten the result into an
-    # array of addresses.
-    return result.flatten
+    return accounts
   end
 
 end