=== modified file 'modules/activitystream/activitystream.install'
--- modules/activitystream/activitystream.install       2008-07-07 19:28:26 +0000
+++ modules/activitystream/activitystream.install       2008-07-07 20:41:50 +0000
@@ -35,9 +35,26 @@
           guid varchar(32) default '',
           PRIMARY KEY (guid)
           ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-                 $q3 = db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('Placeholder', 'profile_activitystream_placeholder', 'Empty by design. This field simply holds the place so the activitystream category can be added to profiles by a module', 'Activity Stream', 'textfield', -10, 0, 0, 0, 0, null, null)");
            break;
+    case 'pgsql':
+      $q1 = db_query("CREATE TABLE {activitystream_accounts} (
+          uid integer NOT NULL default 0,
+          module varchar(255) default '',
+          userid varchar(255) default '',
+          password varchar(255) default '',
+          feed varchar(255) default '',
+          lastfetch timestamp NOT NULL default now()
+          );");
+      $q2 = db_query("CREATE TABLE {activitystream} (
+          nid integer NOT NULL default 0,
+          module varchar(255) default '',
+          link varchar(255) default '',
+          data text default '',
+          guid varchar(32) default '' PRIMARY KEY
+          );");
+      break;
        }
+  $q3 = db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('Placeholder', 'profile_activitystream_placeholder', 'Empty by design. This field simply holds the place so the activitystream category can be added to profiles by a module', 'Activity Stream', 'textfield', -10, 0, 0, 0, 0, null, null)");
        if ($q1 && $q2 && $q3) {
                drupal_set_message(t('Activity Stream module installed successfully.' . $warning));
        }
@@ -57,6 +74,6 @@
   while ($variable = db_fetch_object($variables)) {
     variable_del($variable->name);
   }
-  update_sql("DELETE FROM {profile_fields} WHERE title = 'Placeholder' and name = 'profile_activitystream_placeholder'");
-  update_sql("DELETE FROM {system} WHERE name like '%activitystream'");
-}
\ No newline at end of file
+  db_query("DELETE FROM {profile_fields} WHERE title = 'Placeholder' and name = 'profile_activitystream_placeholder'");
+  db_query("DELETE FROM {system} WHERE name like '%activitystream'");
+}

=== modified file 'modules/activitystream/activitystream.module'
--- modules/activitystream/activitystream.module        2008-07-07 19:28:26 +0000
+++ modules/activitystream/activitystream.module        2008-07-07 21:05:20 +0000
@@ -30,7 +30,7 @@
        if (count($params) == 0) {
                return false;
        }
-       $result = db_query('DELETE FROM {activitystream_accounts} WHERE module = "%s" and uid = %d',$module,$user->uid);
+       $result = db_query("DELETE FROM {activitystream_accounts} WHERE module = '%s' AND uid = %d",$module,$user->uid);
        if (empty($params['userid']) && empty($params['password']) && empty($params['feed'])) {
                return;
        }
@@ -38,7 +38,7 @@
        $arrFeeds = split("\n",$params['feed']);
        foreach ($arrFeeds as $url) {
                $params['feed'] = $url;
-               $result = db_query('INSERT INTO {activitystream_accounts} (module, uid, userid, password, feed) VALUES ("%s", %d, "%s", "%s", "%s")', $module,$user->uid,$params['userid'],$params['password'],$params['feed']);
+               $result = db_query("INSERT INTO {activitystream_accounts} (module, uid, userid, password, feed) VALUES ('%s', %d, '%s', '%s', '%s')", $module,$user->uid,$params['userid'],$params['password'],$params['feed']);
        }
        return true;
 }
@@ -205,7 +205,7 @@

   $node->body = check_markup($node->body, $node->format, FALSE);

-  $result = db_query('SELECT s.module, s.link, s.data, s.nid FROM {activitystream} s WHERE s.nid=%d LIMIT 1', $node->nid);
+  $result = db_query("SELECT s.module, s.link, s.data, s.nid FROM {activitystream} s WHERE s.nid=%d LIMIT 1", $node->nid);
   $action = db_fetch_object($result);
   $node->body .= theme('activitystream_view',$action);

@@ -231,7 +231,7 @@

 function _activitystream_get_activity($user = null, $show_buddies = false, $count = 15) {
        if (module_exists('buddylist') && $show_buddies) {
-               $buddies = db_query('SELECT bl.buddy as bid FROM {buddylist} bl WHERE bl.uid = %d',$user->uid);
+               $buddies = db_query("SELECT bl.buddy as bid FROM {buddylist} bl WHERE bl.uid = %d",$user->uid);
                // Since a number of items might be from the same buddy, load the users now and stuff them
                // into an array for later. This avoids loading the same user multiple times.
                while ($buddy = db_fetch_object($buddies)) {
@@ -243,13 +243,13 @@
                }

                $query = 'SELECT n.title, n.nid, s.module, s.link, s.data, n.created FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid in ('.join(',',array_keys($arrUsers)).') ORDER BY n.created DESC';
-               $countquery = 'SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid in ('.join(',',array_keys($arrUsers)).') ORDER BY n.created DESC';
+               $countquery = 'SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid in ('.join(',',array_keys($arrUsers)).')';
        } elseif ($user->uid) {
                $query = "SELECT n.title, n.nid, s.module, s.link, s.data, n.created FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid = " . $user->uid . " ORDER BY n.created DESC";
-               $countquery = "SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid = " . $user->uid . " ORDER BY n.created";
+               $countquery = "SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 AND n.uid = " . $user->uid;
        } else {
                $query = 'SELECT n.title, n.nid, s.module, s.link, s.data, n.created FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 ORDER BY n.created DESC';
-               $countquery = 'SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1 ORDER BY n.created DESC';
+               $countquery = 'SELECT count(*) FROM {activitystream} s, {node} n WHERE s.nid=n.nid AND n.status =1';
        }
        $datehead = '';
        $stream = pager_query($query, $count, 0, $countquery);
@@ -314,7 +314,7 @@


 function activitystream_cron() {
-       $result = db_query('SELECT uid, userid, password, feed, module from {activitystream_accounts}');
+       $result = db_query("SELECT uid, userid, password, feed, module from {activitystream_accounts}");
        while ($user = db_fetch_object($result)) {
                activitystream_invoke_streamapi($user);
        }
@@ -364,7 +364,7 @@
        if (empty($activity['data'])) {
                $activity['data'] = '';
        }
-       $node = db_fetch_object(db_query('SELECT nid FROM {activitystream} WHERE guid = "%s"',$activity['guid']));
+       $node = db_fetch_object(db_query("SELECT nid FROM {activitystream} WHERE guid = '%s'",$activity['guid']));
        if ($node->nid) {
                node_load($node->nid);
                $new = false;
@@ -390,10 +390,10 @@
        if ($new) {
                node_object_prepare($node);
                node_save($node);
-         $actions = db_query('INSERT into {activitystream} (nid,module, guid, link, data) VALUES (%d,"%s", "%s","%s","%s")',$node->nid,$name,$activity['guid'],$activity['link'],$activity['data']);
+         $actions = db_query("INSERT into {activitystream} (nid,module, guid, link, data) VALUES (%d, '%s', '%s', '%s', '%s')",$node->nid,$name,$activity['guid'],$activity['link'],$activity['data']);
        } else {
                node_save($node);
        }
        watchdog('activitystream', t('Added %title from %name', array('%title' => $node->title, '%name' => $name)));
        return $node->nid;
-}
\ No newline at end of file
+}