summaryrefslogtreecommitdiff
path: root/includes/database/database.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-08 04:45:36 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-08 04:45:36 +0000
commit1632855a9f72a01edf9e8fea44b734cdbb0086a7 (patch)
treef2d724a56d162088fd5a82eed080513c97df2d08 /includes/database/database.inc
parent6159c302e13aac5a6a1152064fda236edd9f04d0 (diff)
downloadbrdo-1632855a9f72a01edf9e8fea44b734cdbb0086a7.tar.gz
brdo-1632855a9f72a01edf9e8fea44b734cdbb0086a7.tar.bz2
#325895 by chx and hswong3i: Fix queryTemporary and add test case.
Diffstat (limited to 'includes/database/database.inc')
-rw-r--r--includes/database/database.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 2a4fab9c3..f7edbd6f0 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -640,7 +640,7 @@ abstract class DatabaseConnection extends PDO {
* A database query result resource, or FALSE if the query was not executed
* correctly.
*/
- abstract function queryTemporary($query, Array $args, $tablename, $options = array());
+ abstract function queryTemporary($query, Array $args, $tablename, Array $options = array());
/**
* Returns the type of database driver.
@@ -1410,10 +1410,9 @@ function db_query_range($query, $args, $from = 0, $count = 0, $options = array()
* placeholders, this is an associative array in any order. If the query uses
* unnamed placeholders (?), this is an indexed array and the order must match
* the order of placeholders in the query string.
- * @param $from
- * The first record from the result set to return.
- * @param $limit
- * The number of records to return from the result set.
+ * @param $tablename
+ * The name of the temporary table to select into. This name will not be
+ * prefixed as there is no risk of collision.
* @param $options
* An array of options to control how the query operates.
*/