#454208: pgsql does not support concat(), so use || instead for postgres.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9ba316e..36972ca 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -12,6 +12,7 @@ Infinite loop protection in panel nodes.
 #459078: Provide the "read more" flag for teasers of panel nodes.
 Fix broken styling when dragging a panel pane.
 Integrate with CTools tab system so we can add edit tabs to all our panel pages.
+#454208: pgsql does not support concat(), so use || instead for postgres.
 
 Panels 6.x-3.0-beta1
 ====================

diff --git a/panels.install b/panels.install
index d4d54fa..b1d1a21 100644 (file)
--- a/panels.install
+++ b/panels.install
@@ -1053,7 +1053,15 @@ function panels_update_6302() {
   $ret[] = update_sql("DROP TABLE {panels_page}");
 
   // Update a couple of pane types that changed and are easily moved:
-  $ret[] = update_sql("UPDATE {panels_pane} SET type = CONCAT(type, '_', subtype) WHERE type = 'node_form'");
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("UPDATE {panels_pane} SET type = CONCAT(type, '_', subtype) WHERE type = 'node_form'");
+      break;
+
+    case 'pgsql':
+      $ret[] = update_sql("UPDATE {panels_pane} SET type = type || '_' || subtype WHERE type = 'node_form'");
+  }
   $ret[] = update_sql("UPDATE {panels_pane} SET type = 'node_form_path' WHERE type = 'node_form_url_path'");
 
   if (module_exists('ctools') && !module_exists('views_content') && db_result(db_query("SELECT pid FROM {panels_pane} WHERE type = 'views'"))) {