deon/lnkohana
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert "Improvements to on() processing for upstream to review"

Browse Source 
This reverts commit c570b45e49.

Breaks on() statements that have an aliased table name
This commit is contained in:
Deon George 2016-08-01 21:34:13 +10:00
parent 0a7e8b349d
commit e3bfa19f3d
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/database/classes/Kohana/Database/Query/Builder/Join.php
View File

@ -127,21 +127,8 @@ class Kohana_Database_Query_Builder_Join extends Database_Query_Builder {
$op = ' '.strtoupper($op); $op = ' '.strtoupper($op);
} }
// In case C2 is prefixed with table
$c2table = FALSE;
$parts = explode('.', $c2);
// If there are parts, we'll check that first one is the table name.
if (count($parts) == 2)
{
if ($db->list_columns($parts[0],$parts[1]))
{
$c2table = TRUE;
}
}
// Quote each of the columns used for the condition // Quote each of the columns used for the condition
$conditions[] = $db->quote_column($c1).$op.' '.($c2table ? $db->quote_column($c2) : $db->quote($c2)); $conditions[] = $db->quote_column($c1).$op.' '.$db->quote_column($c2);
} }
// Concat the conditions "... AND ..." // Concat the conditions "... AND ..."