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

Oops. Reverting #329223. Still needs work.

merge-requests/26/head
Angie Byron 2008-11-08 04:18:08 +00:00
parent 8f093858f7
commit 6159c302e1
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/database/mysql/query.inc
View File

@ -45,7 +45,7 @@ class InsertQuery_mysql extends InsertQuery {
$max_placeholder = 0;
$values = array();
if ($this->insertValues) {
if (count($this->insertValues)) {
foreach ($this->insertValues as $insert_values) {
$placeholders = array();
@ -61,14 +61,11 @@ class InsertQuery_mysql extends InsertQuery {
$values[] = '('. implode(', ', $placeholders) .')';
}
}
elseif ($this->defaultFields) {
else {
// If there are no values, then this is a default-only query. We still need to handle that.
$placeholders = array_fill(0, count($this->defaultFields), 'default');
$values[] = '(' . implode(', ', $placeholders) .')';
}
else {
$values[] = '(default)';
}
$query .= implode(', ', $values);

7
includes/database/pgsql/query.inc
View File

@ -75,7 +75,7 @@ class InsertQuery_pgsql extends InsertQuery {
$max_placeholder = 0;
$values = array();
if ($this->insertValues) {
if (count($this->insertValues)) {
foreach ($this->insertValues as $insert_values) {
$placeholders = array();
@ -91,14 +91,11 @@ class InsertQuery_pgsql extends InsertQuery {
$values[] = '(' . implode(', ', $placeholders) . ')';
}
}
elseif ($this->defaultFields) {
else {
// If there are no values, then this is a default-only query. We still need to handle that.
$placeholders = array_fill(0, count($this->defaultFields), 'default');
$values[] = '(' . implode(', ', $placeholders) .')';
}
else {
$values[] = '(default)';
}
$query .= implode(', ', $values);