diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php index a0a9de8..746a377 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php @@ -7,6 +7,7 @@ namespace Drupal\Core\Database\Driver\pgsql; +use Drupal\Core\Database\Database; use Drupal\Core\Database\Query\Upsert as QueryUpsert; /** @@ -23,88 +24,67 @@ public function execute() { } // Default options for upsert queries. - $this->queryOptions += array( + $this->queryOptions = [ 'throw_exception' => TRUE, - ); + 'already_prepared' => TRUE, + 'return' => Database::RETURN_NULL, + ] + $this->queryOptions; - // Default fields are always placed first for consistency. - $insert_fields = array_merge($this->defaultFields, $this->insertFields); - $insert_fields_escaped = array_map(function($f) { return $this->connection->escapeField($f); }, $insert_fields); + $stmt = $this->connection->prepareQuery((string) $this); - $table = $this->connection->escapeTable($this->table); - $unique_key = $this->connection->escapeField($this->key); + // Fetch the list of blobs and sequences used on that table. + $table_information = $this->connection->schema()->queryTableInformation($this->table); - // We have to execute multiple queries, therefore we wrap everything in a - // transaction so that it is atomic where possible. - $transaction = $this->connection->startTransaction(); - - try { - // First, create a temporary table with the same schema as the table we - // are trying to upsert in. This results in the following query: - // - // CREATE TEMP TABLE temp_table AS SELECT * FROM table_name LIMIT 0; - $query = 'SELECT * FROM {' . $table . '} LIMIT 0'; - $temp_table = $this->connection->queryTemporary($query, [], $this->queryOptions); - - // Second, insert the data in the temporary table. - $insert = $this->connection->insert($temp_table, $this->queryOptions) - ->fields($insert_fields); - foreach ($this->insertValues as $insert_values) { - $insert->values($insert_values); + $max_placeholder = 0; + $blobs = array(); + $blob_count = 0; + foreach ($this->insertValues as $insert_values) { + foreach ($this->insertFields as $idx => $field) { + if (isset($table_information->blob_fields[$field])) { + $blobs[$blob_count] = fopen('php://memory', 'a'); + fwrite($blobs[$blob_count], $insert_values[$idx]); + rewind($blobs[$blob_count]); + + $stmt->bindParam(':db_insert_placeholder_' . $max_placeholder++, $blobs[$blob_count], \PDO::PARAM_LOB); + + // Pre-increment is faster in PHP than increment. + ++$blob_count; + } + else { + $stmt->bindParam(':db_insert_placeholder_' . $max_placeholder++, $insert_values[$idx]); + } } - $insert->execute(); - - // Third, lock the table we're upserting into. - $this->connection->query('LOCK TABLE {' . $table . '} IN EXCLUSIVE MODE', [], $this->queryOptions); - - // Fourth, update any rows that can be updated. This results in the - // following query: - // - // UPDATE table_name - // SET column1 = temp_table.column1 [, column2 = temp_table.column2, ...] - // FROM temp_table - // WHERE table_name.id = temp_table.id; - $update = []; - foreach ($insert_fields_escaped as $field) { - if ($field !== $unique_key) { - $update[] = "$field = {" . $temp_table . "}.$field"; + // Check if values for a serial field has been passed. + if (!empty($table_information->serial_fields)) { + foreach ($table_information->serial_fields as $index => $serial_field) { + $serial_key = array_search($serial_field, $this->insertFields); + if ($serial_key !== FALSE) { + $serial_value = $insert_values[$serial_key]; + + // Sequences must be greater than or equal to 1. + if ($serial_value === NULL || !$serial_value) { + $serial_value = 1; + } + // Set the sequence to the bigger value of either the passed + // value or the max value of the column. It can happen that another + // thread calls nextval() which could lead to a serial number being + // used twice. However, trying to insert a value into a serial + // column should only be done in very rare cases and is not thread + // safe by definition. + $this->connection->query("SELECT setval('" . $table_information->sequences[$index] . "', GREATEST(MAX(" . $serial_field . "), :serial_value)) FROM {" . $this->table . "}", array(':serial_value' => (int) $serial_value)); + } } } - - $update_query = 'UPDATE {' . $table . '} SET ' . implode(', ', $update); - $update_query .= ' FROM {' . $temp_table . '}'; - $update_query .= ' WHERE {' . $temp_table . '}.' . $unique_key . ' = {' . $table . '}.' . $unique_key; - $this->connection->query($update_query, [], $this->queryOptions); - - // Fifth, insert the remaining rows. This results in the following query: - // - // INSERT INTO table_name - // SELECT temp_table.primary_key, temp_table.column1 [, temp_table.column2 ...] - // FROM temp_table - // LEFT OUTER JOIN table_name ON (table_name.id = temp_table.id) - // WHERE table_name.id IS NULL; - $select = $this->connection->select($temp_table, 'temp_table', $this->queryOptions) - ->fields('temp_table', $insert_fields); - $select->leftJoin($this->table, 'actual_table', 'actual_table.' . $this->key . ' = temp_table.' . $this->key); - $select->isNull('actual_table.' . $this->key); - - $this->connection->insert($this->table, $this->queryOptions) - ->from($select) - ->execute(); } - catch (\Exception $e) { - // One of the queries failed, rollback the whole batch. - $transaction->rollback(); - // Rethrow the exception for the calling code. - throw $e; - } + // First, lock the table we're upserting into. + $this->connection->query('LOCK TABLE {' . $this->connection->escapeTable($this->table) . '} IN EXCLUSIVE MODE', [], $this->queryOptions); + + $this->connection->query($stmt, array(), $this->queryOptions); // Re-initialize the values array so that we can re-use this query. $this->insertValues = array(); - // Transaction commits here where $transaction looses scope. - return TRUE; } @@ -112,7 +92,48 @@ public function execute() { * {@inheritdoc} */ public function __toString() { - // Nothing to do. + // Create a sanitized comment string to prepend to the query. + $comments = $this->connection->makeComment($this->comments); + + // Default fields are always placed first for consistency. + $insert_fields = array_merge($this->defaultFields, $this->insertFields); + $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); }, $insert_fields); + + $table = $this->connection->escapeTable($this->table); + $unique_key = $this->connection->escapeField($this->key); + + $query = $comments . 'WITH new_values (' . implode(', ', $insert_fields) . ') as (VALUES '; + + $values = $this->getInsertPlaceholderFragment($this->insertValues, $this->defaultFields); + $query .= implode(', ', $values); + $query .= '), '; + + $query .= 'upsert as ('; + $query .= 'UPDATE {' . $table . '} actual_table SET '; + + $update = []; + foreach ($insert_fields as $field) { + if ($field !== $unique_key) { + $update[] = "$field = nv.$field"; + } + } + + $query .= implode(', ', $update). ' '; + + $query .= 'FROM new_values nv '; + $query .= 'WHERE actual_table.' . $unique_key . ' = nv.' . $unique_key . ' '; + $query .= 'RETURNING actual_table.*'; + + // Close the upsert expression. + $query .= ') '; + + $query .= 'INSERT INTO {' . $table . '} (' . implode(', ', $insert_fields) . ') '; + $query .= 'SELECT ' . implode(', ', $insert_fields) . ' '; + $query .= 'FROM new_values '; + + $query .= 'WHERE NOT EXISTS (SELECT 1 FROM upsert up WHERE up.' . $unique_key . ' = new_values.' . $unique_key . ')'; + + return $query; } }