diff options
Diffstat (limited to 'includes/database.pgsql.inc')
| -rw-r--r-- | includes/database.pgsql.inc | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index c5fd4401b..23fd2b8d6 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -251,7 +251,7 @@ function db_last_insert_id($table, $field) { */ function db_affected_rows() { global $last_result; - return pg_affected_rows($last_result); + return empty($last_result) ? 0 : pg_affected_rows($last_result); } /** @@ -658,12 +658,30 @@ function db_drop_table(&$ret, $table) { * @param $field * Name of the field to be added. * @param $spec - * The field specification array, as taken from a schema definition + * The field specification array, as taken from a schema definition. + * The specification may also contain the key 'initial', the newly + * created field will be set to the value of the key in all rows. + * This is most useful for creating NOT NULL columns with no default + * value in existing tables. */ function db_add_field(&$ret, $table, $field, $spec) { + $fixnull = FALSE; + if (!empty($spec['not null']) && !isset($spec['default'])) { + $fixnull = TRUE; + $spec['not null'] = FALSE; + } $query = 'ALTER TABLE {'. $table .'} ADD COLUMN '; $query .= _db_create_field_sql($field, _db_process_field($spec)); $ret[] = update_sql($query); + if (isset($spec['initial'])) { + // All this because update_sql does not support %-placeholders. + $sql = 'UPDATE {'. $table .'} SET '. $field .' = '. _db_type_placeholder($spec['type']); + $result = db_query($sql, $spec['initial']); + $ret[] = array('success' => $result !== FALSE, 'query' => check_plain($sql .' ('. $spec['initial'] .')')); + } + if ($fixnull) { + $ret[] = update_sql("ALTER TABLE {". $table ."} ALTER $field SET NOT NULL"); + } } /** @@ -811,10 +829,14 @@ function db_drop_index(&$ret, $table, $name) { /** * Change a field definition. * - * Remember that changing a field definition involves adding a new field - * and dropping an old one. This means that any indices, primary keys and - * sequences from serial-type fields are dropped and might need to be - * recreated. + * IMPORTANT NOTE: On some database systems (notably PostgreSQL), + * changing a field definition involves adding a new field and + * dropping an old one. This means that any indices, primary keys and + * sequences (from serial-type fields) that use the field to be + * changed get dropped. For database portability, you MUST drop them + * explicitly before calling db_change_field() and then re-create them + * afterwards. Use db_{add,drop}_{primary_key,unique_key,index} for + * this purpose. * * @param $ret * Array to which query results will be added. |