diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-17 17:59:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-17 17:59:56 +0200 |
| commit | 6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79 (patch) | |
| tree | 6f85434457d1e094430401a701285fe7ca1a7946 /phpBB/includes/db/mysql.php | |
| parent | b45bc27339d03016d47c0247aede8da5ce38a4ee (diff) | |
| parent | 1b826842aadc16ad35485479f4bb3bdef03b534c (diff) | |
| download | forums-6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79.tar forums-6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79.tar.gz forums-6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79.tar.bz2 forums-6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79.tar.xz forums-6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10942' into develop
* nickvergessen/ticket/10942:
[ticket/10942] Avoid possible conflicts with magic words in unit tests
[ticket/10942] Add access modifiers
[ticket/10942] Use ANSI SQL standard || in dbal.php
[ticket/10942] Fix up unit tests for sql_case()
[ticket/10942] Require same data type and do not cast expressions automatically
[ticket/10942] Make unit tests for sql_case simpler
[ticket/10942] Add a comment why we cast to sql_case()
[ticket/10942] Rename method sql_conditional() to sql_case()
[ticket/10942] Change term string to expression to avoid confusion
[ticket/10942] Fix sql_conditional for mssql, postgre and oracle
[ticket/10942] Fix function name on order_lower_test.php
[ticket/10942] Add unit tests for sql_concatenate
[ticket/10942] Add sql_concatenate to dbal
[ticket/10942] Add unit tests for sql_conditional
[ticket/10942] Add sql_conditional to dbal
Diffstat (limited to 'phpBB/includes/db/mysql.php')
| -rw-r--r-- | phpBB/includes/db/mysql.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index eb38e3e913..8d1f805870 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -120,6 +120,14 @@ class dbal_mysql extends dbal } /** + * {@inheritDoc} + */ + public function sql_concatenate($expr1, $expr2) + { + return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')'; + } + + /** * SQL Transaction * @access private */ |