Bug 1737 fixed : Concatenation error with POstgreSQL

Simplify same function for SQLite git-svn-id: http://piwigo.org/svn/trunk@6580 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jun 22, 2010 · bedacf7 · bedacf7
1 parent 5a677f1
commit bedacf7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/include/dblayer/functions_pdo-sqlite.inc.php b/include/dblayer/functions_pdo-sqlite.inc.php
@@ -413,9 +413,7 @@ function pwg_db_concat($array)
 
 function pwg_db_concat_ws($array, $separator)
 {
-  $glue = sprintf(' || \'%s\' || ', $separator);
-
-  return implode($array, $glue);
+  return implode($array, ' || \''.$separator.'\' || ');
 }
 
 function pwg_db_cast_to_text($string)

diff --git a/include/dblayer/functions_pgsql.inc.php b/include/dblayer/functions_pgsql.inc.php
@@ -449,14 +449,12 @@ function do_maintenance_all_tables()
 
 function pwg_db_concat($array)
 {
-  $string = implode($array, ',');
-  return 'ARRAY_TO_STRING(ARRAY['.$string.'])';
+  return implode($array, ' || ');
 }
 
 function pwg_db_concat_ws($array, $separator)
 {
-  $string = implode($array, ',');
-  return 'ARRAY_TO_STRING(ARRAY['.$string.'],\''.$separator.'\')';
+  return implode($array, ' || \''.$separator.'\' || ');
 }
 
 function pwg_db_cast_to_text($string)

diff --git a/include/dblayer/functions_sqlite.inc.php b/include/dblayer/functions_sqlite.inc.php
@@ -425,9 +425,7 @@ function pwg_db_concat($array)
 
 function pwg_db_concat_ws($array, $separator)
 {
-  $glue = sprintf(' || \'%s\' || ', $separator);
-
-  return implode($array, $glue);
+  return implode($array, ' || \''.$separator.'\' || ');
 }
 
 function pwg_db_cast_to_text($string)