diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-08-17 06:52:02 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-08-17 06:52:02 +0000 |
| commit | 55d9463766e08ebaf9aa08955a418e18fd889353 (patch) | |
| tree | 37c9b5933d3e58daefaa3f90ec90a013b3922433 /includes/database/pgsql | |
| parent | 9b4013fd82fa117215a928671ab9a72f4972fc59 (diff) | |
| download | brdo-55d9463766e08ebaf9aa08955a418e18fd889353.tar.gz brdo-55d9463766e08ebaf9aa08955a418e18fd889353.tar.bz2 | |
- Patch #370240 by Josh Waihi, stuzza, mfb, Arancaytar: PDO should quote index names in table declarations.
Diffstat (limited to 'includes/database/pgsql')
| -rw-r--r-- | includes/database/pgsql/schema.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc index 2d282b50b..61080c0ad 100644 --- a/includes/database/pgsql/schema.inc +++ b/includes/database/pgsql/schema.inc @@ -260,7 +260,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { $ret[] = 'substr(' . $field[0] . ', 1, ' . $field[1] . ')'; } else { - $ret[] = $field; + $ret[] = '"' . $field . '"'; } } return implode(', ', $ret); @@ -355,7 +355,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { * The field to be dropped. */ public function dropField(&$ret, $table, $field) { - $ret[] = update_sql('ALTER TABLE {' . $table . '} DROP COLUMN ' . $field); + $ret[] = update_sql('ALTER TABLE {' . $table . '} DROP COLUMN "' . $field . '"'); } /** @@ -378,7 +378,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { $default = is_string($default) ? "'$default'" : $default; } - $ret[] = update_sql('ALTER TABLE {' . $table . '} ALTER COLUMN ' . $field . ' SET DEFAULT ' . $default); + $ret[] = update_sql('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" SET DEFAULT ' . $default); } /** @@ -392,7 +392,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { * The field to be altered. */ public function fieldSetNoDefault(&$ret, $table, $field) { - $ret[] = update_sql('ALTER TABLE {' . $table . '} ALTER COLUMN ' . $field . ' DROP DEFAULT'); + $ret[] = update_sql('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" DROP DEFAULT'); } /** @@ -435,7 +435,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { */ function addUniqueKey(&$ret, $table, $name, $fields) { $name = '{' . $table . '}_' . $name . '_key'; - $ret[] = update_sql('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $name . ' UNIQUE (' . implode(',', $fields) . ')'); + $ret[] = update_sql('ALTER TABLE {' . $table . '} ADD CONSTRAINT "' . $name . '" UNIQUE (' . implode(',', $fields) . ')'); } /** @@ -450,7 +450,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { */ public function dropUniqueKey(&$ret, $table, $name) { $name = '{' . $table . '}_' . $name . '_key'; - $ret[] = update_sql('ALTER TABLE {' . $table . '} DROP CONSTRAINT ' . $name); + $ret[] = update_sql('ALTER TABLE {' . $table . '} DROP CONSTRAINT "' . $name . '"'); } /** @@ -578,7 +578,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { } protected function _createIndexSql($table, $name, $fields) { - $query = 'CREATE INDEX {' . $table . '}_' . $name . '_idx ON {' . $table . '} ('; + $query = 'CREATE INDEX "{' . $table . '}_' . $name . '_idx" ON {' . $table . '} ('; $query .= $this->_createKeySql($fields) . ')'; return $query; } |