Index: pathauto.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v
retrieving revision 1.171
diff -u -p -r1.171 pathauto.module
--- pathauto.module	25 Jan 2011 01:36:00 -0000	1.171
+++ pathauto.module	31 Jan 2011 23:43:35 -0000
@@ -167,25 +167,6 @@ function pathauto_pattern_load_by_entity
 }
 
 /**
- * Return the proper SQL to perform cross-db and field-type concatenation.
- *
- * @return
- *   A string of SQL with the concatenation.
- */
-function _pathauto_sql_concat() {
-  $args = func_get_args();
-  switch (db_driver()) {
-    case 'mysql':
-      return 'CONCAT(' . implode(', ', $args) . ')';
-    case 'mssql':
-      return '(' . implode(' + ', $args) . ')';
-    default:
-      // The ANSI standard of concatentation uses the double-pipe.
-      return '(' . implode(' || ', $args) . ')';
-  }
-}
-
-/**
  * Delete multiple URL aliases.
  *
  * Intent of this is to abstract a potential path_delete_multiple() function
Index: pathauto.pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.pathauto.inc,v
retrieving revision 1.7
diff -u -p -r1.7 pathauto.pathauto.inc
--- pathauto.pathauto.inc	13 Jan 2011 03:27:23 -0000	1.7
+++ pathauto.pathauto.inc	31 Jan 2011 23:43:35 -0000
@@ -91,8 +91,7 @@ function node_pathauto_bulk_update_batch
   }
 
   $query = db_select('node', 'n');
-  $concat = _pathauto_sql_concat("'node/'", 'n.nid');
-  $query->leftJoin('url_alias', 'ua', "$concat = ua.source");
+  $query->leftJoin('url_alias', 'ua', "CONCAT('node/', n.nid) = ua.source");
   $query->addField('n', 'nid');
   $query->isNull('ua.source');
   $query->condition('n.nid', $context['sandbox']['current'], '>');
@@ -166,8 +165,7 @@ function taxonomy_pathauto_bulk_update_b
   }
 
   $query = db_select('taxonomy_term_data', 'td');
-  $concat = _pathauto_sql_concat("'taxonomy/term/'", 'td.tid');
-  $query->leftJoin('url_alias', 'ua', "$concat = ua.source");
+  $query->leftJoin('url_alias', 'ua', "CONCAT('taxonomy/term/', td.tid) = ua.source");
   $query->addField('td', 'tid');
   $query->isNull('ua.source');
   // Exclude the forums terms.
@@ -232,8 +230,7 @@ function forum_pathauto_bulk_update_batc
   }
 
   $query = db_select('taxonomy_term_data', 'td');
-  $concat = _pathauto_sql_concat("'forum/'", 'td.tid');
-  $query->leftJoin('url_alias', 'ua', "$concat = ua.source");
+  $query->leftJoin('url_alias', 'ua', "CONCAT('forum/', td.tid) = ua.source");
   $query->addField('td', 'tid');
   $query->isNull('ua.source');
   $query->condition('vid', variable_get('forum_nav_vocabulary', ''));
@@ -295,8 +292,7 @@ function user_pathauto_bulk_update_batch
   }
 
   $query = db_select('users', 'u');
-  $concat = _pathauto_sql_concat("'user/'", 'u.uid');
-  $query->leftJoin('url_alias', 'ua', "$concat = ua.source");
+  $query->leftJoin('url_alias', 'ua', "CONCAT('user/', u.uid) = ua.source");
   $query->addField('u', 'uid');
   $query->isNull('ua.source');
   $query->condition('u.uid', $context['sandbox']['current'], '>');
@@ -358,8 +354,7 @@ function blog_pathauto_bulk_update_batch
   }
 
   $query = db_select('users', 'u');
-  $concat = _pathauto_sql_concat("'blog/'", 'u.uid');
-  $query->leftJoin('url_alias', 'ua', "$concat = ua.source");
+  $query->leftJoin('url_alias', 'ua', "CONCAT('blog/', u.uid) = ua.source");
   $query->addField('u', 'uid');
   $query->isNull('ua.source');
   $query->condition('u.uid', $context['sandbox']['current'], '>');