Index: xmlsitemap_user/xmlsitemap_user.module
===================================================================
--- xmlsitemap_user/xmlsitemap_user.module	(revision 515)
+++ xmlsitemap_user/xmlsitemap_user.module	(working copy)
@@ -246,7 +246,7 @@
       case 'mysql':
       case 'mysqli':
         $query .= "
-          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('user/', u.uid)";
+          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('user/', CAST(u.uid AS CHAR))";
         break;
       case 'pgsql':
         $query .= "
Index: xmlsitemap_user/xmlsitemap_user.install
===================================================================
--- xmlsitemap_user/xmlsitemap_user.install	(revision 515)
+++ xmlsitemap_user/xmlsitemap_user.install	(working copy)
@@ -56,7 +56,7 @@
     case 'mysql':
     case 'mysqli':
       $query .= "
-        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('user/', u.uid)";
+        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('user/', CAST(u.uid AS CHAR))";
       break;
     case 'pgsql':
       $query .= "
@@ -102,7 +102,7 @@
     case 'mysqli':
       $ret[] = update_sql("
         UPDATE {xmlsitemap_user} xu, {url_alias} ua SET xu.pid = ua.pid
-        WHERE xu.pid IS NULL AND ua.src = CONCAT('user/', xu.uid)
+        WHERE xu.pid IS NULL AND ua.src = CONCAT('user/', CAST(xu.uid AS CHAR))
       ");
       break;
     case 'pgsql':
Index: xmlsitemap_node/xmlsitemap_node.module
===================================================================
--- xmlsitemap_node/xmlsitemap_node.module	(revision 515)
+++ xmlsitemap_node/xmlsitemap_node.module	(working copy)
@@ -264,7 +264,7 @@
         case 'mysql':
         case 'mysqli':
           $query .= "
-            LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', %d)";
+            LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', CAST(%d AS CHAR))";
           break;
         case 'pgsql':
           $query .= "
@@ -288,7 +288,7 @@
         case 'mysql':
         case 'mysqli':
           db_query("
-            UPDATE {xmlsitemap_node} xn LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', xn.nid)
+            UPDATE {xmlsitemap_node} xn LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', CAST(xn.nid AS CHAR))
             SET xn.pid = ua.pid, xn.previously_changed = xn.last_changed, xn.last_changed = %d, xn.priority_override = %s
             WHERE xn.nid = %d
           ", $node->changed, $node->priority_override, $node->nid);
@@ -374,7 +374,7 @@
       case 'mysql':
       case 'mysqli':
         $query .= "
-          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', n.nid)";
+          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', CAST(n.nid AS CHAR))";
         break;
       case 'pgsql':
         $query .= "
Index: xmlsitemap_node/xmlsitemap_node.install
===================================================================
--- xmlsitemap_node/xmlsitemap_node.install	(revision 515)
+++ xmlsitemap_node/xmlsitemap_node.install	(working copy)
@@ -48,7 +48,7 @@
       case 'mysqli':
         db_query("
           UPDATE {xmlsitemap_node} xn, {url_alias} ua SET xn.pid = ua.pid
-          WHERE xn.pid IS NULL AND ua.src = CONCAT('node/', xn.nid)
+          WHERE xn.pid IS NULL AND ua.src = CONCAT('node/', CAST(xn.nid AS CHAR))
         ");
         break;
       case 'pgsql':
@@ -125,7 +125,7 @@
     case 'mysql':
     case 'mysqli':
       $query .= "
-        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', n.nid)";
+        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', CAST(n.nid AS CHAR))";
       break;
     case 'pgsql':
       $query .= "
@@ -134,7 +134,7 @@
   }
   $query .= "
     WHERE xn.nid IS NULL
-    GROUP BY n.nid, ua.pid, n.changed, s.last_comment_timestamp
+    GROUP BY n.nid
   ";
   return $query;
 }
@@ -199,7 +199,7 @@
       $ret[] = update_sql("
         UPDATE {xmlsitemap_node} xn
         INNER JOIN {node} n ON n.nid = xn.nid
-        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', xn.nid) AND xn.pid IS NULL
+        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('node/', CAST(xn.nid AS CHAR)) AND xn.pid IS NULL
         SET xn.last_changed = n.changed, xn.pid = ua.pid
       ");
       break;
Index: xmlsitemap_term/xmlsitemap_term.install
===================================================================
--- xmlsitemap_term/xmlsitemap_term.install	(revision 515)
+++ xmlsitemap_term/xmlsitemap_term.install	(working copy)
@@ -46,7 +46,7 @@
     case 'mysql':
     case 'mysqli':
       $query .= "
-        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('taxonomy/term/', td.tid) OR ua.src = CONCAT('forum/', td.tid)";
+        LEFT JOIN {url_alias} ua ON ua.src = CONCAT('%s', CAST(td.tid AS CHAR))";
       break;
     case 'pgsql':
       $query .= "
@@ -56,7 +56,14 @@
   $query .= "
     WHERE xt.tid IS NULL
   ";
-  db_query($query, time());
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query($query, time(), 'taxonomy/term/');
+      db_query($query, time(), 'forum/');
+    case 'pgsql':
+      db_query($query, time());
+  }
   xmlsitemap_update_sitemap();
 }
 
@@ -90,7 +97,7 @@
       $ret[] = update_sql("
         UPDATE {xmlsitemap_term} xt, {url_alias} ua SET xt.pid = ua.pid
         WHERE xt.pid IS NULL AND (
-          ua.src = CONCAT('taxonomy/term/', xt.tid) OR ua.src = CONCAT('forum/', xt.tid)
+          ua.src = CONCAT('%s', CAST(xt.tid AS CHAR)) OR ua.src = CONCAT('forum/', CAST(xt.tid AS CHAR))
         )
       ");
       break;
Index: xmlsitemap_term/xmlsitemap_term.module
===================================================================
--- xmlsitemap_term/xmlsitemap_term.module	(revision 515)
+++ xmlsitemap_term/xmlsitemap_term.module	(working copy)
@@ -238,7 +238,7 @@
       case 'mysql':
       case 'mysqli':
         $query .= "
-          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('taxonomy/term/', td.tid) OR ua.src = CONCAT('forum/', td.tid)";
+          LEFT JOIN {url_alias} ua ON ua.src = CONCAT('%s', CAST(td.tid AS CHAR))";
         break;
       case 'pgsql':
         $query .= "
@@ -248,7 +248,14 @@
     $query .= "
       WHERE xt.tid IS NULL
     ";
-    db_query($query, time());
+    switch ($GLOBALS['db_type']) {
+      case 'mysql':
+      case 'mysqli':
+        db_query($query, time(), 'taxonomy/term/');
+        db_query($query, time(), 'forum/');
+      case 'pgsql':
+        db_query($query, time());
+    }
     xmlsitemap_update_sitemap();
   }
 }
