=== modified file 'modules/activitystream/activitystream.install'
--- modules/activitystream/activitystream.install       2008-08-09 16:12:34 +0000
+++ modules/activitystream/activitystream.install       2008-08-09 20:12:49 +0000
@@ -36,6 +36,23 @@
           PRIMARY KEY (guid)
           ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
       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;
   }
   if ($q1 && $q2) {
     drupal_set_message(t('Activity Stream module installed successfully.' . $warning));
@@ -66,4 +83,4 @@
 function activitystream_update_1() {
   $ret[] = update_sql("DELETE FROM {profile_fields} WHERE title = 'Placeholder' and name = 'profile_activitystream_placeholder'");
   return $ret;
-}
\ No newline at end of file
+}

=== modified file 'modules/activitystream/activitystream.module'
--- modules/activitystream/activitystream.module        2008-08-09 16:12:34 +0000
+++ modules/activitystream/activitystream.module        2008-08-09 20:17:14 +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;
 }
@@ -252,13 +252,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) {
     $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 = '';
   $items = array();
@@ -377,7 +377,7 @@
   else {
     $activity['guid'] = md5($activity['guid']);    
   }
-  $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_delete($node->nid);
   }
@@ -421,10 +421,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
+}