mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 20:40:24 +02:00
Code Issues Releases Wiki Activity

[ticket/10942] Use ANSI SQL standard || in dbal.php

Browse Source 
PHPBB3-10942
This commit is contained in:
Joas Schilling
2012-07-02 23:11:21 +02:00
parent ad9d650659
commit fe1f21d1a5
6 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/db/dbal.php
View File

@@ -311,7 +311,7 @@ class dbal
*/
function sql_concatenate($expr1, $expr2)
{
return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
return $expr1 . ' || ' . $expr2;
}
/**

8
phpBB/includes/db/firebird.php
View File

@@ -110,14 +110,6 @@ class dbal_firebird extends dbal
return ($raw) ? '2.1' : 'Firebird/Interbase';
}
/**
* {@inheritDoc}
*/
function sql_concatenate($expr1, $expr2)
{
return $expr1 . ' || ' . $expr2;
}
/**
* SQL Transaction
* @access private

8
phpBB/includes/db/mysql.php
View File

@@ -119,6 +119,14 @@ class dbal_mysql extends dbal
return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
}
/**
* {@inheritDoc}
*/
function sql_concatenate($expr1, $expr2)
{
return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
}
/**
* SQL Transaction
* @access private

8
phpBB/includes/db/mysqli.php
View File

@@ -122,6 +122,14 @@ class dbal_mysqli extends dbal
return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
}
/**
* {@inheritDoc}
*/
function sql_concatenate($expr1, $expr2)
{
return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
}
/**
* SQL Transaction
* @access private

8
phpBB/includes/db/postgres.php
View File

@@ -154,14 +154,6 @@ class dbal_postgres extends dbal
return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
}
/**
* {@inheritDoc}
*/
function sql_concatenate($expr1, $expr2)
{
return $expr1 . ' || ' . $expr2;
}
/**
* SQL Transaction
* @access private

8
phpBB/includes/db/sqlite.php
View File

@@ -72,14 +72,6 @@ class dbal_sqlite extends dbal
return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
}
/**
* {@inheritDoc}
*/
function sql_concatenate($expr1, $expr2)
{
return $expr1 . ' || ' . $expr2;
}
/**
* SQL Transaction
* @access private