1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +02:00

Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop-olympus

* github-nickvergessen/ticket/10296:
  [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
  [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
This commit is contained in:
Nils Adermann
2011-11-18 19:17:20 +01:00
3 changed files with 99 additions and 1 deletions

View File

@@ -609,7 +609,7 @@ class dbal
}
}
$sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array));
$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
if (!empty($array['LEFT_JOIN']))
{