summaryrefslogtreecommitdiff
path: root/includes/database
diff options
context:
space:
mode:
Diffstat (limited to 'includes/database')
-rw-r--r--includes/database/pgsql/database.inc14
-rw-r--r--includes/database/pgsql/install.inc6
2 files changed, 10 insertions, 10 deletions
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc
index 218d10865..a42e377cb 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -52,10 +52,10 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
$options += $this->defaultOptions();
- // The PDO PostgreSQL driver has a bug which
+ // The PDO PostgreSQL driver has a bug which
// doesn't type cast booleans correctly when
- // parameters are bound using associative
- // arrays.
+ // parameters are bound using associative
+ // arrays.
// See http://bugs.php.net/bug.php?id=48383
foreach ($args as &$value) {
if (is_bool($value)) {
@@ -141,12 +141,12 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
*/
public function nextId($existing = 0) {
- // Retrive the name of the sequence. This information cannot be cached
+ // Retrive the name of the sequence. This information cannot be cached
// because the prefix may change, for example, like it does in simpletests.
$sequence_name = $this->makeSequenceName('sequences', 'value');
- // When PostgreSQL gets a value too small then it will lock the table,
- // retry the INSERT and if it's still too small then alter the sequence.
+ // When PostgreSQL gets a value too small then it will lock the table,
+ // retry the INSERT and if it's still too small then alter the sequence.
$id = $this->query("SELECT nextval('" . $sequence_name . "')")->fetchField();
if ($id > $existing) {
return $id;
@@ -154,7 +154,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
// PostgreSQL advisory locks are simply locks to be used by an
// application such as Drupal. This will prevent other Drupal proccesses
- // from altering the sequence while we are.
+ // from altering the sequence while we are.
$this->query("SELECT pg_advisory_lock(" . POSTGRESQL_NEXTID_LOCK . ")");
// While waiting to obtain the lock, the sequence may have been altered
diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc
index 72f2865d3..2223781dc 100644
--- a/includes/database/pgsql/install.inc
+++ b/includes/database/pgsql/install.inc
@@ -32,13 +32,13 @@ class DatabaseTasks_pgsql extends DatabaseTasks {
*/
protected function checkEncoding() {
try {
- if (db_query('SHOW server_encoding')->fetchField() == 'UTF8') {
+ if (db_query('SHOW server_encoding')->fetchField() == 'UTF8') {
$this->pass(st('Database is encoded in UTF-8'));
}
else {
$replacements = array(
- '%encoding' => 'UTF8',
- '%driver' => $this->name(),
+ '%encoding' => 'UTF8',
+ '%driver' => $this->name(),
'!link' => '<a href="INSTALL.pgsql.txt">INSTALL.pgsql.txt</a>'
);
$text = 'The %driver database must use %encoding encoding to work with Drupal.';