aviat
/
Query
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Activity

Fix minor issue of where clause disappearing after a number of joins

This commit is contained in:
Timothy Warren 2014-06-30 11:14:37 -04:00
parent 7fd90aba76
commit 618a561c71
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/abstract/abstract_query_builder.php
View File

@ -376,14 +376,15 @@ abstract class Abstract_Query_Builder {
$item .= (count($f_array) === 1) ? '=?' : " {$f_array[1]} ?";
// Get the type of the first item in the query map
$first_item = end($this->query_map);
$first_item = current($this->query_map);
$last_item = end($this->query_map);
// Determine the correct conjunction
if (empty($this->query_map))
if (empty($this->query_map) || stripos($first_item['conjunction'], 'JOIN') !== FALSE)
{
$conj = "\nWHERE ";
}
elseif ($first_item['type'] === 'group_start')
elseif ($last_item['type'] === 'group_start')
{
$conj = '';
}