From 2e86ad317ebbfec3768c6589061575bf4c7cc995 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 14 Jun 2010 12:26:32 +0000 Subject: - Patch #826668 by Damien Tournoud: db_add_field() will not accept 'foreign keys' even though it is part of schema api. --- includes/database/mysql/schema.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'includes/database/mysql/schema.inc') diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 8a9d0176e..6a173d4fe 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -316,8 +316,8 @@ class DatabaseSchema_mysql extends DatabaseSchema { } $query = 'ALTER TABLE {' . $table . '} ADD '; $query .= $this->createFieldSql($field, $this->processField($spec)); - if (count($keys_new)) { - $query .= ', ADD ' . implode(', ADD ', $this->createKeysSql($keys_new)); + if ($keys_sql = $this->createKeysSql($keys_new)) { + $query .= ', ADD ' . implode(', ADD ', $keys_sql); } $this->connection->query($query); if (isset($spec['initial'])) { @@ -439,8 +439,8 @@ class DatabaseSchema_mysql extends DatabaseSchema { } $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSql($field_new, $this->processField($spec)); - if (count($keys_new)) { - $sql .= ', ADD ' . implode(', ADD ', $this->createKeysSql($keys_new)); + if ($keys_sql = $this->createKeysSql($keys_new)) { + $sql .= ', ADD ' . implode(', ADD ', $keys_sql); } $this->connection->query($sql); } -- cgit v1.2.3