sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database: store user creation date

Browse Source 
This is useful to figure out which users were created recently.
This commit is contained in:
Simon Ser 2023-01-26 12:34:53 +01:00
parent 2abe231eef
commit 5a9dced249
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/postgres.go
View File

@ -31,7 +31,8 @@ CREATE TABLE "User" (
password VARCHAR(255), password VARCHAR(255),
admin BOOLEAN NOT NULL DEFAULT FALSE, admin BOOLEAN NOT NULL DEFAULT FALSE,
nick VARCHAR(255), nick VARCHAR(255),
realname VARCHAR(255) realname VARCHAR(255),
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()
); );
CREATE TYPE sasl_mechanism AS ENUM ('PLAIN', 'EXTERNAL'); CREATE TYPE sasl_mechanism AS ENUM ('PLAIN', 'EXTERNAL');
@ -167,6 +168,7 @@ var postgresMigrations = []string{
`, `,
`ALTER TABLE "Network" ADD COLUMN auto_away BOOLEAN NOT NULL DEFAULT TRUE`, `ALTER TABLE "Network" ADD COLUMN auto_away BOOLEAN NOT NULL DEFAULT TRUE`,
`ALTER TABLE "Network" ADD COLUMN certfp TEXT`, `ALTER TABLE "Network" ADD COLUMN certfp TEXT`,
`ALTER TABLE "User" ADD COLUMN created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now()`,
} }
type PostgresDB struct { type PostgresDB struct {

15
database/sqlite.go
View File

@ -20,6 +20,7 @@ const SqliteEnabled = true
const sqliteQueryTimeout = 5 * time.Second const sqliteQueryTimeout = 5 * time.Second
const sqliteTimeLayout = "2006-01-02T15:04:05.000Z" const sqliteTimeLayout = "2006-01-02T15:04:05.000Z"
const sqliteTimeFormat = "%Y-%m-%dT%H:%M:%fZ"
type sqliteTime struct { type sqliteTime struct {
time.Time time.Time
@ -60,7 +61,8 @@ CREATE TABLE User (
password TEXT, password TEXT,
admin INTEGER NOT NULL DEFAULT 0, admin INTEGER NOT NULL DEFAULT 0,
realname TEXT, realname TEXT,
nick TEXT nick TEXT,
created_at TEXT NOT NULL
); );
CREATE TABLE Network ( CREATE TABLE Network (
@ -281,6 +283,12 @@ var sqliteMigrations = []string{
"ALTER TABLE User ADD COLUMN nick TEXT;", "ALTER TABLE User ADD COLUMN nick TEXT;",
"ALTER TABLE Network ADD COLUMN auto_away INTEGER NOT NULL DEFAULT 1;", "ALTER TABLE Network ADD COLUMN auto_away INTEGER NOT NULL DEFAULT 1;",
"ALTER TABLE Network ADD COLUMN certfp TEXT;", "ALTER TABLE Network ADD COLUMN certfp TEXT;",
// SQLite doesn't support non-constant default values, so use an empty
// string as default and update all columns in a separate statement
`
ALTER TABLE User ADD COLUMN created_at TEXT NOT NULL DEFAULT '';
UPDATE User SET created_at = strftime('` + sqliteTimeFormat + `', 'now');
`,
} }
type SqliteDB struct { type SqliteDB struct {
@ -434,6 +442,7 @@ func (db *SqliteDB) StoreUser(ctx context.Context, user *User) error {
sql.Named("admin", user.Admin), sql.Named("admin", user.Admin),
sql.Named("nick", toNullString(user.Nick)), sql.Named("nick", toNullString(user.Nick)),
sql.Named("realname", toNullString(user.Realname)), sql.Named("realname", toNullString(user.Realname)),
sql.Named("now", sqliteTime{time.Now()}),
} }
var err error var err error
@ -446,8 +455,8 @@ func (db *SqliteDB) StoreUser(ctx context.Context, user *User) error {
var res sql.Result var res sql.Result
res, err = db.db.ExecContext(ctx, ` res, err = db.db.ExecContext(ctx, `
INSERT INTO INSERT INTO
User(username, password, admin, nick, realname) User(username, password, admin, nick, realname, created_at)
VALUES (:username, :password, :admin, :nick, :realname)`, VALUES (:username, :password, :admin, :nick, :realname, :now)`,
args...) args...)
if err != nil { if err != nil {
return err return err