Changeset 6581

Timestamp:

Jun 22, 2010, 11:19:17 PM (14 years ago)

Author:

nikrou

Message:

Bug 1737 fixed : merge from trunk
Concatenation error with POstgreSQL
Simplify same function for SQLite

Location:

branches/2.1/include/dblayer

Files:

• functions_pdo-sqlite.inc.php (modified) (1 diff)
• functions_pgsql.inc.php (modified) (1 diff)
• functions_sqlite.inc.php (modified) (1 diff)

branches/2.1/include/dblayer/functions_pdo-sqlite.inc.php

@@ -414 +414 @@
 function pwg_db_concat_ws($array, $separator)
 {
-  $glue = sprintf(' || \'%s\' || ', $separator);
-
-  return implode($array, $glue);
+  return implode($array, ' || \''.$separator.'\' || ');
 }
 

branches/2.1/include/dblayer/functions_pgsql.inc.php

@@ -450 +450 @@
 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.'\' || ');
 }
 

branches/2.1/include/dblayer/functions_sqlite.inc.php

@@ -426 +426 @@
 function pwg_db_concat_ws($array, $separator)
 {
-  $glue = sprintf(' || \'%s\' || ', $separator);
-
-  return implode($array, $glue);
+  return implode($array, ' || \''.$separator.'\' || ');
 }