Overhaul everything to get consistent error reports.

[mailshears.git] / lib / rm / plugins / postfixadmin.rb

diff --git a/lib/rm/plugins/postfixadmin.rb b/lib/rm/plugins/postfixadmin.rb
index 94526bcd25bfc058a1c05bd92081caeb16fa5caa..eddf93976981a5d031772cb3398001346d0fbc12 100644 (file)
--- a/lib/rm/plugins/postfixadmin.rb
+++ b/lib/rm/plugins/postfixadmin.rb
@@ -10,7 +10,7 @@ class PostfixadminRm
 
 
   def delete_user(user)
-    raise NonexistentUserError.new(user) if not user_exists(user)
+    raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
 
     sql_queries = ['DELETE FROM alias WHERE address = $1;']
     # Wipe out any aliases pointed at our user.
@@ -33,7 +33,7 @@ class PostfixadminRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [user])
+        connection.query(sql_query, [user.to_s()])
       end
 
       # The earlier alias update query will leave things like
@@ -53,7 +53,7 @@ class PostfixadminRm
 
 
   def delete_domain(domain)
-    raise NonexistentDomainError.new(domain) if not domain_exists(domain)
+    raise NonexistentDomainError.new(domain.to_s()) if not domain_exists(domain)
 
     sql_queries = ['DELETE FROM domain_admins WHERE domain = $1;']
     sql_queries << 'DELETE FROM alias WHERE domain = $1;'
@@ -73,7 +73,7 @@ class PostfixadminRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [domain])
+        connection.query(sql_query, [domain.to_s()])
       end
 
       connection.close()
@@ -102,7 +102,7 @@ class PostfixadminRm
                                   @db_pass)
 
       sql_query = 'SELECT COUNT(domain) as count FROM domain WHERE domain = $1;'
-      connection.query(sql_query, [domain]) do |result|
+      connection.query(sql_query, [domain.to_s()]) do |result|
         return false if result.ntuples() < 1
         begin
           count = result.getvalue(0,0).to_i()