Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#325895 by chx: Fix queryTemporary, which was missing a required argument.

merge-requests/26/head
Angie Byron 2008-10-25 02:03:55 +00:00
parent 63e8d1e3d3
commit 47949ad142
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/database/database.inc
View File

@ -631,11 +631,14 @@ abstract class DatabaseConnection extends PDO {
* @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 associative array of options to control how the query is run. See
* the documentation for DatabaseConnection::defaultOptions() for details.
* @return
* A database query result resource, or FALSE if the query was not executed
* correctly.
*/
abstract function queryTemporary($query, Array $args, $tablename);
abstract function queryTemporary($query, Array $args, $tablename, $options = array());
/**
* Returns the type of database driver.

2
includes/database/mysql/database.inc
View File

@ -46,7 +46,7 @@ class DatabaseConnection_mysql extends DatabaseConnection {
return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
}
public function queryTemporary($query, Array $args, $tablename) {
public function queryTemporary($query, Array $args, $tablename, $options = array()) {
$query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE ' . $tablename . ' Engine=HEAP SELECT', $this->prefixTables($query));
return $this->query($query, $args, $options);