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 7998bfe677681638766b26a54275419b0a18d20f..0249ea07949b384a5438f34c9c5f7c27e582d7e0 100644 (file)
--- a/src/postfixadmin_db.rb
+++ b/src/postfixadmin_db.rb
@@ -1,4 +1,4 @@
-require 'postgres'
+require 'pg'
 
 class PostfixadminDb
 
@@ -20,7 +20,37 @@ class PostfixadminDb
   end
 
 
+  def get_domains_from_db()
+    domains = []
+
+    # Just assume PostgreSQL for now.
+    begin
+      connection = PGconn.connect(@db_host,
+                                  @db_port,
+                                  @db_opts,
+                                  @db_tty,
+                                  @db_name,
+                                  @db_user,
+                                  @db_pass)
+
+      # '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
+
+    return domains
+  end
+
+
   def get_accounts_from_db()
+    accounts = []
+
     # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
@@ -33,18 +63,17 @@ class PostfixadminDb
 
       # If address = goto, then the alias basically says, "really
       # deliver to that address; it's not an alias."
-      sql_query = 'SELECT address FROM alias WHERE address = goto;'
-      result = connection.query(sql_query)
+      sql_query = 'SELECT username FROM mailbox;'
+      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