Fossil SCM
Avoid uniqueness errors when inserting default users.
Commit
646c4a67f9a5b212f338ccc311e1ce43c6cdc20a
Parent
ab9b449190c7da3…
1 file changed
+4
-4
M
src/db.c
+4
-4
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1262,17 +1262,17 @@ | ||
| 1262 | 1262 | "UPDATE user SET cap='s', pw=lower(hex(randomblob(3)))" |
| 1263 | 1263 | " WHERE login=%Q", zUser |
| 1264 | 1264 | ); |
| 1265 | 1265 | if( !setupUserOnly ){ |
| 1266 | 1266 | db_multi_exec( |
| 1267 | - "INSERT INTO user(login,pw,cap,info)" | |
| 1267 | + "INSERT OR IGNORE INTO user(login,pw,cap,info)" | |
| 1268 | 1268 | " VALUES('anonymous',hex(randomblob(8)),'hmncz','Anon');" |
| 1269 | - "INSERT INTO user(login,pw,cap,info)" | |
| 1269 | + "INSERT OR IGNORE INTO user(login,pw,cap,info)" | |
| 1270 | 1270 | " VALUES('nobody','','gjor','Nobody');" |
| 1271 | - "INSERT INTO user(login,pw,cap,info)" | |
| 1271 | + "INSERT OR IGNORE INTO user(login,pw,cap,info)" | |
| 1272 | 1272 | " VALUES('developer','','dei','Dev');" |
| 1273 | - "INSERT INTO user(login,pw,cap,info)" | |
| 1273 | + "INSERT OR IGNORE INTO user(login,pw,cap,info)" | |
| 1274 | 1274 | " VALUES('reader','','kptw','Reader');" |
| 1275 | 1275 | ); |
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | 1278 | |
| 1279 | 1279 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1262,17 +1262,17 @@ | |
| 1262 | "UPDATE user SET cap='s', pw=lower(hex(randomblob(3)))" |
| 1263 | " WHERE login=%Q", zUser |
| 1264 | ); |
| 1265 | if( !setupUserOnly ){ |
| 1266 | db_multi_exec( |
| 1267 | "INSERT INTO user(login,pw,cap,info)" |
| 1268 | " VALUES('anonymous',hex(randomblob(8)),'hmncz','Anon');" |
| 1269 | "INSERT INTO user(login,pw,cap,info)" |
| 1270 | " VALUES('nobody','','gjor','Nobody');" |
| 1271 | "INSERT INTO user(login,pw,cap,info)" |
| 1272 | " VALUES('developer','','dei','Dev');" |
| 1273 | "INSERT INTO user(login,pw,cap,info)" |
| 1274 | " VALUES('reader','','kptw','Reader');" |
| 1275 | ); |
| 1276 | } |
| 1277 | } |
| 1278 | |
| 1279 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1262,17 +1262,17 @@ | |
| 1262 | "UPDATE user SET cap='s', pw=lower(hex(randomblob(3)))" |
| 1263 | " WHERE login=%Q", zUser |
| 1264 | ); |
| 1265 | if( !setupUserOnly ){ |
| 1266 | db_multi_exec( |
| 1267 | "INSERT OR IGNORE INTO user(login,pw,cap,info)" |
| 1268 | " VALUES('anonymous',hex(randomblob(8)),'hmncz','Anon');" |
| 1269 | "INSERT OR IGNORE INTO user(login,pw,cap,info)" |
| 1270 | " VALUES('nobody','','gjor','Nobody');" |
| 1271 | "INSERT OR IGNORE INTO user(login,pw,cap,info)" |
| 1272 | " VALUES('developer','','dei','Dev');" |
| 1273 | "INSERT OR IGNORE INTO user(login,pw,cap,info)" |
| 1274 | " VALUES('reader','','kptw','Reader');" |
| 1275 | ); |
| 1276 | } |
| 1277 | } |
| 1278 | |
| 1279 |