diff --git a/sqlite/auth.go b/sqlite/auth.go index 999b034..240e789 100644 --- a/sqlite/auth.go +++ b/sqlite/auth.go @@ -292,9 +292,11 @@ func createAuth(ctx context.Context, tx *Tx, auth *wtf.Auth) error { } // Update caller object to set ID. - if auth.ID, err = lastInsertID(result); err != nil { + id, err := result.LastInsertId() + if err != nil { return err } + auth.ID = int(id) return nil } diff --git a/sqlite/dial.go b/sqlite/dial.go index d79f7cf..30fb852 100644 --- a/sqlite/dial.go +++ b/sqlite/dial.go @@ -397,9 +397,11 @@ func createDial(ctx context.Context, tx *Tx, dial *wtf.Dial) error { } // Read back new dial ID into caller argument. - if dial.ID, err = lastInsertID(result); err != nil { + id, err := result.LastInsertId() + if err != nil { return err } + dial.ID = int(id) // Record initial value to history table. if err := insertDialValue(ctx, tx, dial.ID, dial.Value, dial.CreatedAt); err != nil { diff --git a/sqlite/dial_membership.go b/sqlite/dial_membership.go index 2f21cc4..c49d7a0 100644 --- a/sqlite/dial_membership.go +++ b/sqlite/dial_membership.go @@ -268,9 +268,11 @@ func createDialMembership(ctx context.Context, tx *Tx, membership *wtf.DialMembe } // Assign new database ID to the caller's arg. - if membership.ID, err = lastInsertID(result); err != nil { + id, err := result.LastInsertId() + if err != nil { return err } + membership.ID = int(id) // Ensure computed parent dial value is up to date. if err := refreshDialValue(ctx, tx, membership.DialID); err != nil { diff --git a/sqlite/sqlite.go b/sqlite/sqlite.go index 9aea30e..54a8c6a 100644 --- a/sqlite/sqlite.go +++ b/sqlite/sqlite.go @@ -256,12 +256,6 @@ type Tx struct { now time.Time } -// lastInsertID is a helper function for reading the last inserted ID as an int. -func lastInsertID(result sql.Result) (int, error) { - id, err := result.LastInsertId() - return int(id), err -} - // NullTime represents a helper wrapper for time.Time. It automatically converts // time fields to/from RFC 3339 format. Also supports NULL for zero time. type NullTime time.Time diff --git a/sqlite/user.go b/sqlite/user.go index 58f6529..ce5911c 100644 --- a/sqlite/user.go +++ b/sqlite/user.go @@ -247,9 +247,11 @@ func createUser(ctx context.Context, tx *Tx, user *wtf.User) error { return FormatError(err) } - if user.ID, err = lastInsertID(result); err != nil { + id, err := result.LastInsertId() + if err != nil { return err } + user.ID = int(id) return nil }