Stop pretending that we'll ever work with another DBMS.

[mailshears.git] / lib / mv / plugins / davical.rb

diff --git a/lib/mv/plugins/davical.rb b/lib/mv/plugins/davical.rb
index 860abdc3765a2e0b47dd08c244ca0a8b3fa1f38a..20c8a32af50d668fe8ccba1f690091cbddcafe9a 100644 (file)
--- a/lib/mv/plugins/davical.rb
+++ b/lib/mv/plugins/davical.rb
@@ -1,6 +1,6 @@
 require 'pg'
 
 require 'pg'
 

-require 'common/plugin'
+require 'common/davical_plugin'

 require 'rm/rm_plugin'
 
 class DavicalMv
 require 'rm/rm_plugin'
 
 class DavicalMv


@@ -8,105 +8,33 @@ class DavicalMv
   # DAViCal only supports Postgres, so even if we ever are
   # database-agnostic, this plugin can't be.
   #
   # DAViCal only supports Postgres, so even if we ever are
   # database-agnostic, this plugin can't be.
   #

-  include Plugin
+  include DavicalPlugin

   include MvPlugin
 
   include MvPlugin
 

-  def initialize()
-    cfg = Configuration.new()
-    @db_host = cfg.davical_dbhost
-    @db_port = cfg.davical_dbport
-    @db_opts = cfg.davical_dbopts
-    @db_tty  = cfg.davical_dbtty
-    @db_name = cfg.davical_dbname
-    @db_user = cfg.davical_dbuser
-    @db_pass = cfg.davical_dbpass
-  end
-
-
-  def describe_domain(domain)
-    # DAViCal doesn't have a concept of domains.
-    return 'N/A'
-  end
-
-
-  def describe_account(account)
-    principal_id = self.get_principal_id(account)
-
-    if principal_id.nil?
-      return 'User not found'
-    else
-      return "Principal ID: #{principal_id}"
-    end
-  end
-
-
-  def mv_domain(from, to)
-    # DAViCal doesn't have a concept of domains.
-  end
-

 
 

-  def mv_account(from, to)
-    # Delete the given username. DAViCal uses foreign keys properly
+  def mv_user(src, dst)
+    # Switch the given usernames. DAViCal uses foreign keys properly

     # and only supports postgres, so we let the ON UPDATE CASCADE
     # trigger handle most of the work.
     # and only supports postgres, so we let the ON UPDATE CASCADE
     # trigger handle most of the work.

-    sql_queries = ['UPDATE usr SET username = $1 WHERE username = $2']
-
-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      sql_queries.each do |sql_query|
-        connection.query(sql_query, [to, from])
-      end
-
-      connection.close()
-
-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
-    end

 
 

-  end
-
-
-  protected;
+    # It's obviously an error if the source user does not exist. It
+    # would also be an error if the destination domain didn't exist;
+    # however, DAViCal doesn't know about domains, so we let that slide.
+    raise NonexistentUserError.new(src.to_s()) if not user_exists(src)

 
 

-  def get_principal_id(account)
-    principal_id = nil
+    # And it's an error if the destination user exists already.
+    raise UserAlreadyExistsError.new(dst.to_s()) if user_exists(dst)

 
 

-    begin
-      connection = PGconn.connect(@db_host,
-                                  @db_port,
-                                  @db_opts,
-                                  @db_tty,
-                                  @db_name,
-                                  @db_user,
-                                  @db_pass)
-
-      sql_query =  "SELECT principal.principal_id "
-      sql_query += "FROM (principal INNER JOIN usr "
-      sql_query += "      ON principal.user_no = usr.user_no) "
-      sql_query += "WHERE usr.username = $1;"
-
-      connection.query(sql_query, [account]) do |result|
-        if result.num_tuples > 0
-          principal_id = result[0]['principal_id']
-        end
-      end
+    sql_queries = ['UPDATE usr SET username = $1 WHERE username = $2']

 
 

-      connection.close()
+    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
+                                @db_name, @db_user, @db_pass)

 
 

-    rescue PGError => e
-      # Pretend like we're database-agnostic in case we ever are.
-      raise DatabaseError.new(e)
+    sql_queries.each do |sql_query|
+      connection.query(sql_query, [dst.to_s(), src.to_s()])

     end
 
     end
 

-    return principal_id
+    connection.close()

   end
 
 end
   end
 
 end