--- comment_notify/comment_notify.install.orig	2008-12-29 13:04:44.000000000 +0300
+++ comment_notify/comment_notify.install	2008-12-29 13:10:01.000000000 +0300
@@ -13,7 +13,14 @@
   drupal_install_schema('comment_notify');
 
   // Insert a record for each existing comment.
+  if ( $GLOBALS['db_type']=='pgsql')
+            {
+  db_query("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, 0, md5(c.mail || coalesce(u.mail, u.init) || c.uid || c.name || c.nid) FROM {comments} c LEFT OUTER JOIN {users} u on c.uid = u.uid");
+            }
+        else
+            {
   db_query("INSERT INTO {comment_notify} (cid, notify, notify_hash) SELECT c.cid, 0, md5(concat(c.mail, ifnull(u.mail, u.init), c.uid, c.name, c.nid)) FROM {comments} c LEFT OUTER JOIN {users} u on c.uid = u.uid");
+            }
 
   // Set module weight low so that other modules act on the comment first.
   db_query("UPDATE {system} SET weight = 10 WHERE name = 'comment_notify'");
--- comment_notify/comment_notify.module.orig	2008-12-29 13:04:49.000000000 +0300
+++ comment_notify/comment_notify.module	2008-12-29 13:55:44.000000000 +0300
@@ -444,11 +444,11 @@
   $result = db_result(db_query_range("SELECT uid FROM {users} WHERE mail = '%s'", $email, 0, 1));
   if ($result > 0) {
     $comments = db_result(db_query("SELECT COUNT(1) FROM {comments} c INNER JOIN {comment_notify} cn ON c.cid = cn.cid WHERE c.uid = %d AND cn.notify > 0", $result));
-    db_query("UPDATE {comment_notify} cn INNER JOIN {comments} c ON cn.cid = c.cid SET cn.notify = 0 WHERE c.uid = %d", $result);
+    db_query("UPDATE {comment_notify} SET notify = 0 WHERE cid IN (SELECT cid FROM  {comments} WHERE uid = %d)", $result);
   }
   else {
     $comments = db_result(db_query("SELECT COUNT(1) FROM {comments} c INNER JOIN {comment_notify} cn ON c.cid = cn.cid WHERE c.mail = '%s' AND cn.notify > 0", $email));
-    db_query("UPDATE {comment_notify} cn INNER JOIN {comments} c ON cn.cid = c.cid SET cn.notify = 0 WHERE c.mail = '%s'", $email);
+    db_query("UPDATE {comment_notify} SET notify = 0 WHERE cid IN (SELECT cid FROM {comments} WHERE mail = '%s')", $email);
   }
   // Update the admin about the state of this comment notification subscription.
   if ($comments == 0) {