opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.2. For more information, see https://www.drupal.org/project/drupal/releases/8.2.2

Browse source
This commit is contained in:
Pantheon Automation 2016-11-02 11:43:31 -07:00 • committed by Greg Anderson
parent 23ffed3665
commit 507b45a0ed
378 changed files with 11434 additions and 5542 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
View file

@ -120,7 +120,7 @@ class Schema extends DatabaseSchema {
// By default, MySQL uses the default collation for new tables, which is
// 'utf8mb4_general_ci' for utf8mb4. If an alternate collation has been
// set, it needs to be explicitly specified.
// @see DatabaseConnection_mysql
// @see \Drupal\Core\Database\Driver\mysql\Schema
if (!empty($info['collation'])) {
$sql .= ' COLLATE ' . $info['collation'];
}

4
core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
View file

@ -20,8 +20,8 @@ class Schema extends DatabaseSchema {
/**
* A cache of information about blob columns and sequences of tables.
*
* This is collected by DatabaseConnection_pgsql->queryTableInformation(),
* by introspecting the database.
* This is collected by Schema::queryTableInformation(), by introspecting the
* database.
*
* @see \Drupal\Core\Database\Driver\pgsql\Schema::queryTableInformation()
* @var array

2
core/lib/Drupal/Core/Database/StatementPrefetch.php
View file

@ -306,7 +306,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
return $this->fetchOptions['object'];
case \PDO::FETCH_COLUMN:
if (isset($this->columnNames[$this->fetchOptions['column']])) {
return $this->currentRow[$k][$this->columnNames[$this->fetchOptions['column']]];
return $this->currentRow[$this->columnNames[$this->fetchOptions['column']]];
}
else {
return;