makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10942] Change term string to expression to avoid confusion

Browse source 
PHPBB3-10942
This commit is contained in:
Joas Schilling 2012-06-20 12:50:12 +02:00
parent c8e322d88f
commit 79dfdf9406
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/db/dbal.php
View file

@ -301,15 +301,15 @@ class dbal
}
/**
* Build a concatenated string
* Build a concatenated expression
*
* @param string $string1 Base SQL statement where we append the second one
* @param string $string2 SQL statement that is appended on the first statement
* @param string $expr1 Base SQL expression where we append the second one
* @param string $expr2 SQL expression that is appended to the first expression
* @return string Concatenated string
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return 'CONCAT(' . $string1 . ', ' . $string2 . ')';
return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
}
/**

4
phpBB/includes/db/firebird.php
View file

@ -113,9 +113,9 @@ class dbal_firebird extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' || ' . $string2;
return $expr1 . ' || ' . $expr2;
}
/**

4
phpBB/includes/db/mssql.php
View file

@ -106,9 +106,9 @@ class dbal_mssql extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' + ' . $string2;
return $expr1 . ' + ' . $expr2;
}
/**

4
phpBB/includes/db/mssql_odbc.php
View file

@ -124,9 +124,9 @@ class dbal_mssql_odbc extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' + ' . $string2;
return $expr1 . ' + ' . $expr2;
}
/**

4
phpBB/includes/db/mssqlnative.php
View file

@ -272,9 +272,9 @@ class dbal_mssqlnative extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' + ' . $string2;
return $expr1 . ' + ' . $expr2;
}
/**

4
phpBB/includes/db/postgres.php
View file

@ -169,9 +169,9 @@ class dbal_postgres extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' || ' . $string2;
return $expr1 . ' || ' . $expr2;
}
/**

4
phpBB/includes/db/sqlite.php
View file

@ -75,9 +75,9 @@ class dbal_sqlite extends dbal
/**
* {@inheritDoc}
*/
function sql_concatenate($string1, $string2)
function sql_concatenate($expr1, $expr2)
{
return $string1 . ' || ' . $string2;
return $expr1 . ' || ' . $expr2;
}
/**