archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug 1737 fixed : merge from trunk

Browse source 
Concatenation error with POstgreSQL
Simplify same function for SQLite

git-svn-id: http://piwigo.org/svn/branches/2.1@6581 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-06-22 21:19:17 +00:00
parent 1661af7f3f
commit c04a906ec4
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/dblayer/functions_pdo-sqlite.inc.php
View file

@ -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)

6
include/dblayer/functions_pgsql.inc.php
View file

@ -449,14 +449,12 @@ WHERE tablename like \''.$prefixeTable.'%\'';
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)

4
include/dblayer/functions_sqlite.inc.php
View file

@ -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)