Changeset 568 in code for trunk/db_sqlite.go
- Timestamp:
- Jun 25, 2021, 6:33:13 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/db_sqlite.go
r542 r568 17 17 username VARCHAR(255) NOT NULL UNIQUE, 18 18 password VARCHAR(255), 19 admin INTEGER NOT NULL DEFAULT 0 19 admin INTEGER NOT NULL DEFAULT 0, 20 realname VARCHAR(255) 20 21 ); 21 22 … … 134 135 "ALTER TABLE Channel ADD COLUMN detached_internal_msgid VARCHAR(255)", 135 136 "ALTER TABLE Network ADD COLUMN enabled INTEGER NOT NULL DEFAULT 1", 137 "ALTER TABLE User ADD COLUMN realname VARCHAR(255)", 136 138 } 137 139 … … 243 245 user := &User{Username: username} 244 246 245 var password sql.NullString246 row := db.db.QueryRow("SELECT id, password, admin FROM User WHERE username = ?", username)247 if err := row.Scan(&user.ID, &password, &user.Admin ); err != nil {247 var password, realname sql.NullString 248 row := db.db.QueryRow("SELECT id, password, admin, realname FROM User WHERE username = ?", username) 249 if err := row.Scan(&user.ID, &password, &user.Admin, &realname); err != nil { 248 250 return nil, err 249 251 } 250 252 user.Password = password.String 253 user.Realname = realname.String 251 254 return user, nil 252 255 } … … 257 260 258 261 password := toNullString(user.Password) 262 realname := toNullString(user.Realname) 259 263 260 264 var err error 261 265 if user.ID != 0 { 262 _, err = db.db.Exec("UPDATE User SET password = ?, admin = ? WHERE username = ?",263 password, user.Admin, user.Username)266 _, err = db.db.Exec("UPDATE User SET password = ?, admin = ?, realname = ? WHERE username = ?", 267 password, user.Admin, realname, user.Username) 264 268 } else { 265 269 var res sql.Result 266 res, err = db.db.Exec("INSERT INTO User(username, password, admin ) VALUES (?, ?, ?)",267 user.Username, password, user.Admin )270 res, err = db.db.Exec("INSERT INTO User(username, password, admin, realname) VALUES (?, ?, ?, ?)", 271 user.Username, password, user.Admin, realname) 268 272 if err != nil { 269 273 return err
Note:
See TracChangeset
for help on using the changeset viewer.