summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-04-27 10:42:58 +0000
committerDries Buytaert <dries@buytaert.net>2010-04-27 10:42:58 +0000
commitca0323d2dec404d68ff920f0e71f186b90ead565 (patch)
tree53e0889a0144bf026a4fcf90a15cbbd614d2b010 /includes
parent3d84cef194ea08ef65edac975975158d9eb922fa (diff)
downloadbrdo-ca0323d2dec404d68ff920f0e71f186b90ead565.tar.gz
brdo-ca0323d2dec404d68ff920f0e71f186b90ead565.tar.bz2
- Patch #701888 by jhodgdon: subqueries are not altered and test clean-up.
Diffstat (limited to 'includes')
-rw-r--r--includes/database/select.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc
index 16c352ea3..8a6a4ab30 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -1319,7 +1319,10 @@ class SelectQuery extends Query implements SelectQueryInterface {
// If the table is a subquery, compile it and integrate it into this query.
if ($table['table'] instanceof SelectQueryInterface) {
- $table_string = '(' . (string)$table['table'] . ')';
+ // Run preparation steps on this sub-query before converting to string.
+ $subquery = $table['table'];
+ $subquery->preExecute();
+ $table_string = '(' . (string) $subquery . ')';
}
else {
$table_string = '{' . $this->connection->escapeTable($table['table']) . '}';