? profiles/simpletest ? sites/default/modules ? sites/default/settings.php Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.110 diff -u -p -r1.110 system.admin.inc --- modules/system/system.admin.inc 26 Nov 2008 13:54:05 -0000 1.110 +++ modules/system/system.admin.inc 27 Nov 2008 05:56:18 -0000 @@ -1796,7 +1796,7 @@ function system_status($check = FALSE) { } // MySQL import might have set the uid of the anonymous user to autoincrement // value. Let's try fixing it. See http://drupal.org/node/204411 - db_query("UPDATE {users} SET uid = uid - uid WHERE name = '' AND pass = '' AND status = 0"); + db_query("UPDATE {users} SET uid = uid - uid WHERE name = 'default' AND pass = 'default' AND status = 0"); return theme('status_report', $requirements); } Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.288 diff -u -p -r1.288 system.install --- modules/system/system.install 25 Nov 2008 13:16:39 -0000 1.288 +++ modules/system/system.install 27 Nov 2008 05:56:18 -0000 @@ -351,7 +351,7 @@ function system_install() { // uid 2 which is not what we want. So we insert the first user here, the // anonymous user. uid is 1 here for now, but very soon it will be changed // to 0. - db_query("INSERT INTO {users} (name, mail) VALUES('%s', '%s')", '', ''); + db_query("INSERT INTO {users} (name, pass, status) VALUES ('default', 'default', 0)"); // We need some placeholders here as name and mail are uniques and data is // presumed to be a serialized array. Install will change uid 1 immediately // anyways. So we insert the superuser here, the uid is 2 here for now, but @@ -359,7 +359,7 @@ function system_install() { db_query("INSERT INTO {users} (name, mail, created, status, data) VALUES('%s', '%s', %d, %d, '%s')", 'placeholder-for-uid-1', 'placeholder-for-uid-1', REQUEST_TIME, 1, serialize(array())); // This sets the above two users uid 0 (anonymous). We avoid an explicit 0 // otherwise MySQL might insert the next auto_increment value. - db_query("UPDATE {users} SET uid = uid - uid WHERE name = '%s'", ''); + db_query("UPDATE {users} SET uid = uid - uid WHERE name = 'default'"); // This sets uid 1 (superuser). We skip uid 2 but that's not a big problem. db_query("UPDATE {users} SET uid = 1 WHERE name = '%s'", 'placeholder-for-uid-1'); Index: modules/user/user.install =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.install,v retrieving revision 1.15 diff -u -p -r1.15 user.install --- modules/user/user.install 20 Nov 2008 06:56:17 -0000 1.15 +++ modules/user/user.install 27 Nov 2008 05:56:18 -0000 @@ -100,14 +100,14 @@ function user_schema() { 'type' => 'varchar', 'length' => 60, 'not null' => TRUE, - 'default' => '', + 'default' => 'default', 'description' => 'Unique user name.', ), 'pass' => array( 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, - 'default' => '', + 'default' => 'default', 'description' => "User's password (hashed).", ), 'mail' => array( @@ -360,6 +360,41 @@ function user_update_7002(&$sandbox) { } /** + * Replace fields default value from '' to 'default'. + */ +function user_update_7003() { + $ret = array(); + + $schema['users'] = array( + 'fields' => array( + 'name' => array( + 'type' => 'varchar', + 'length' => 60, + 'not null' => TRUE, + 'default' => 'default', + 'description' => 'Unique user name.', + ), + 'pass' => array( + 'type' => 'varchar', + 'length' => 128, + 'not null' => TRUE, + 'default' => 'default', + 'description' => "User's password (hashed).", + ), + ), + ); + + foreach ($schema as $table => $fields) { + foreach ($fields['fields'] as $field => $def) { + db_change_field($ret, $table, $field, $field, $def); + $ret[] = update_sql("UPDATE {" . $table . "} SET " . $field . " = 'default' WHERE " . $field . " = ''"); + } + } + + return $ret; +} + +/** * @} End of "defgroup user-updates-6.x-to-7.x" * The next series of updates should start at 8000. */