diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-04-20 20:02:31 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-04-20 20:02:31 +0000 |
commit | f09028107ca18a8f897ff517d2ed04688e1c567d (patch) | |
tree | 1f6cff867077daac6dbdd9a78967679cadef1b8c /includes/database/mysql | |
parent | 10931908b5885741be806ff15586770691801e51 (diff) | |
download | brdo-f09028107ca18a8f897ff517d2ed04688e1c567d.tar.gz brdo-f09028107ca18a8f897ff517d2ed04688e1c567d.tar.bz2 |
- Patch #413732 by brianV: database code clean-up.
Diffstat (limited to 'includes/database/mysql')
-rw-r--r-- | includes/database/mysql/install.inc | 6 | ||||
-rw-r--r-- | includes/database/mysql/query.inc | 12 | ||||
-rw-r--r-- | includes/database/mysql/schema.inc | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/includes/database/mysql/install.inc b/includes/database/mysql/install.inc index 5f15fa35d..cee986225 100644 --- a/includes/database/mysql/install.inc +++ b/includes/database/mysql/install.inc @@ -1,6 +1,12 @@ <?php // $Id$ +/** + * @file + * Installation code for MySQL embedded database engine. + */ + + // MySQL specific install functions class DatabaseInstaller_mysql extends DatabaseInstaller { diff --git a/includes/database/mysql/query.inc b/includes/database/mysql/query.inc index c9a3a51ce..b2dbae04c 100644 --- a/includes/database/mysql/query.inc +++ b/includes/database/mysql/query.inc @@ -6,6 +6,12 @@ * @{ */ +/** + * @file + * Query code for MySQL embedded database engine. + */ + + class InsertQuery_mysql extends InsertQuery { public function execute() { @@ -64,16 +70,16 @@ class InsertQuery_mysql extends InsertQuery { $new_placeholder = $max_placeholder + count($insert_values); for ($i = $max_placeholder; $i < $new_placeholder; ++$i) { - $placeholders[] = ':db_insert_placeholder_'. $i; + $placeholders[] = ':db_insert_placeholder_' . $i; } $max_placeholder = $new_placeholder; - $values[] = '('. implode(', ', $placeholders) .')'; + $values[] = '(' . implode(', ', $placeholders) . ')'; } } else { // If there are no values, then this is a default-only query. We still need to handle that. $placeholders = array_fill(0, count($this->defaultFields), 'default'); - $values[] = '(' . implode(', ', $placeholders) .')'; + $values[] = '(' . implode(', ', $placeholders) . ')'; } $query .= implode(', ', $values); diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index b64e6040f..aa0905a35 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -224,7 +224,7 @@ class DatabaseSchema_mysql extends DatabaseSchema { } if (!empty($spec['unique keys'])) { foreach ($spec['unique keys'] as $key => $fields) { - $keys[] = 'UNIQUE KEY ' . $key .' ('. $this->createKeysSqlHelper($fields) . ')'; + $keys[] = 'UNIQUE KEY ' . $key . ' (' . $this->createKeysSqlHelper($fields) . ')'; } } if (!empty($spec['indexes'])) { @@ -352,7 +352,7 @@ class DatabaseSchema_mysql extends DatabaseSchema { // Work around a bug in some versions of PDO, see http://bugs.php.net/bug.php?id=41125 $comment = str_replace("'", '’', $comment); - + // Truncate comment to maximum comment length. if (isset($length)) { // Add table prefixes before truncating. |