Changeset 382 in code for trunk/db.go

Timestamp:

Aug 11, 2020, 8:26:42 AM (5 years ago)

Author:

contact

Message:

Add User.ID

For now it's just a new field that'll be useful to generate user ident
strings. It uses the SQLite implicit rowid column. In the future the DB
interface will need to be updated to use user IDs instead of usernames.

File:

• trunk/db.go (modified) (5 diffs)

trunk/db.go

@@ -11 +11 @@
 
 type User struct {
-        Created  bool
+        ID       int64
         Username string
         Password string // hashed
@@ -191 +191 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query("SELECT username, password, admin FROM User")
+        rows, err := db.db.Query("SELECT rowid, username, password, admin FROM User")
         if err != nil {
                 return nil, err
@@ -201 +201 @@
                 var user User
                 var password *string
-                if err := rows.Scan(&user.Username, &password, &user.Admin); err != nil {
+                if err := rows.Scan(&user.ID, &user.Username, &password, &user.Admin); err != nil {
                         return nil, err
                 }
-                user.Created = true
                 user.Password = fromStringPtr(password)
                 users = append(users, user)
@@ -219 +218 @@
         defer db.lock.RUnlock()
 
-        user := &User{Created: true, Username: username}
+        user := &User{Username: username}
 
         var password *string
-        row := db.db.QueryRow("SELECT password, admin FROM User WHERE username = ?", username)
-        if err := row.Scan(&password, &user.Admin); err != nil {
+        row := db.db.QueryRow("SELECT rowid, password, admin FROM User WHERE username = ?", username)
+        if err := row.Scan(&user.ID, &password, &user.Admin); err != nil {
                 return nil, err
         }
@@ -237 +236 @@
 
         var err error
-        if user.Created {
+        if user.ID != 0 {
                 _, err = db.db.Exec("UPDATE User SET password = ?, admin = ? WHERE username = ?",
                         password, user.Admin, user.Username)
         } else {
-                _, err = db.db.Exec("INSERT INTO User(username, password, admin) VALUES (?, ?, ?)",
+                var res sql.Result
+                res, err = db.db.Exec("INSERT INTO User(username, password, admin) VALUES (?, ?, ?, ?)",
                         user.Username, password, user.Admin)
-                if err == nil {
-                        user.Created = true
-                }
+                if err != nil {
+                        return err
+                }
+                user.ID, err = res.LastInsertId()
         }