diff options
-rw-r--r-- | includes/database/mysql/schema.inc | 4 | ||||
-rw-r--r-- | includes/database/pgsql/schema.inc | 2 | ||||
-rw-r--r-- | includes/database/schema.inc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 45543d253..35d59c1a1 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -372,11 +372,11 @@ class DatabaseSchema_mysql extends DatabaseSchema { if (isset($column)) { $condition->condition('column_name', $column); $condition->compile($this->connection); - // Don't use {} around information_schema table. + // Don't use {} around information_schema.columns table. return db_query("SELECT column_comment FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchField(); } $condition->compile($this->connection); - // Don't use {} around information_schema table. + // Don't use {} around information_schema.tables table. $comment = db_query("SELECT table_comment FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField(); // Work-around for MySQL 5.0 bug http://bugs.mysql.com/bug.php?id=11379 return preg_replace('/; InnoDB free:.*$/', '', $comment); diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc index 5135b90df..fabdb09bc 100644 --- a/includes/database/pgsql/schema.inc +++ b/includes/database/pgsql/schema.inc @@ -51,7 +51,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { 'blob_fields' => array(), 'sequences' => array(), ); - // Don't use {} around information_schema table. + // Don't use {} around information_schema.columns table. $result = db_query("SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_schema = :schema AND table_name = :table AND (data_type = 'bytea' OR (numeric_precision IS NOT NULL AND column_default LIKE :default))", array(':schema' => $schema, ':table' => $table_name, ':default' => '%nextval%')); foreach ($result as $column) { if ($column->data_type == 'bytea') { diff --git a/includes/database/schema.inc b/includes/database/schema.inc index 569a6b300..bc5dd7c2f 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -187,7 +187,7 @@ abstract class DatabaseSchema { // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. - // Don't use {} around information_schema table. + // Don't use {} around information_schema.tables table. return db_query("SELECT table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchField(); } @@ -207,7 +207,7 @@ abstract class DatabaseSchema { // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. - // Don't use {} around information_schema table. + // Don't use {} around information_schema.tables table. return db_query("SELECT table_name FROM information_schema.tables WHERE " . (string) $condition, $condition->arguments())->fetchAllKeyed(0, 0); } @@ -222,7 +222,7 @@ abstract class DatabaseSchema { // concatination for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. - // Don't use {} around information_schema table. + // Don't use {} around information_schema.columns table. return db_query("SELECT column_name FROM information_schema.columns WHERE " . (string) $condition, $condition->arguments())->fetchAllKeyed(0, 0); } |