Commit 7fcde37a authored by webchick's avatar webchick

#890794 by Berdir: Fixed Upgrade tests broken on PostgreSQL.

parent aa235ac5
......@@ -2043,12 +2043,12 @@ function system_update_7016() {
$datatype = 'bigint';
break;
}
db_query('ALTER TABLE ' . $row->table . ' ALTER COLUMN ' . $row->field . ' TYPE ' . $datatype);
db_query('ALTER TABLE ' . $row->table . ' ADD CHECK (' . $row->field . ' >= 0)');
db_query('ALTER TABLE ' . $row->table . ' ALTER COLUMN "' . $row->field . '" TYPE ' . $datatype);
db_query('ALTER TABLE ' . $row->table . ' ADD CHECK ("' . $row->field . '" >= 0)');
}
db_query('DROP DOMAIN smallint_unsigned');
db_query('DROP DOMAIN int_unsigned');
db_query('DROP DOMAIN bigint_unsigned');
db_query('DROP DOMAIN IF EXISTS smallint_unsigned');
db_query('DROP DOMAIN IF EXISTS int_unsigned');
db_query('DROP DOMAIN IF EXISTS bigint_unsigned');
}
}
......
......@@ -690,7 +690,7 @@ function user_update_7012(&$sandbox) {
// Initialize batch update information.
$sandbox['progress'] = 0;
$sandbox['last_user_processed'] = -1;
$sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE picture <> 0")->fetchField();
$sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE picture <> ''")->fetchField();
}
// As a batch operation move the photos into the {file_managed} table and
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment