From 60ba4b5612a0ccddadbf5793c200789921bd78e3 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Wed, 4 May 2022 17:53:49 +0200 Subject: [PATCH] Fix stupid mistake.. and just return the NullString --- userapi/storage/postgres/accounts_table.go | 10 +++++----- userapi/storage/sqlite3/accounts_table.go | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/userapi/storage/postgres/accounts_table.go b/userapi/storage/postgres/accounts_table.go index 674f0cdb2..a7a0ae3fa 100644 --- a/userapi/storage/postgres/accounts_table.go +++ b/userapi/storage/postgres/accounts_table.go @@ -142,9 +142,9 @@ func (s *accountsStatements) InsertAccount( var err error if accountType != api.AccountTypeAppService { - _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, nil, accountType) + _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, nil, accountType, policyVersion) } else { - _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, appserviceID, accountType) + _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, appserviceID, accountType, policyVersion) } if err != nil { return nil, err @@ -219,10 +219,10 @@ func (s *accountsStatements) SelectNewNumericLocalpart( func (s *accountsStatements) SelectPrivacyPolicy( ctx context.Context, txn *sql.Tx, localPart string, ) (policy string, err error) { + var policyNull sql.NullString stmt := sqlutil.TxStmt(txn, s.selectPrivacyPolicyStmt) - - err = stmt.QueryRowContext(ctx, localPart).Scan(&policy) - return + err = stmt.QueryRowContext(ctx, localPart).Scan(&policyNull) + return policyNull.String, err } // batchSelectPrivacyPolicy queries all users which didn't accept the current policy version diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go index 6390cfc6a..b433e47a0 100644 --- a/userapi/storage/sqlite3/accounts_table.go +++ b/userapi/storage/sqlite3/accounts_table.go @@ -144,9 +144,9 @@ func (s *accountsStatements) InsertAccount( var err error if accountType != api.AccountTypeAppService { - _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, nil, accountType) + _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, nil, accountType, policyVersion) } else { - _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, appserviceID, accountType) + _, err = stmt.ExecContext(ctx, localpart, createdTimeMS, hash, appserviceID, accountType, policyVersion) } if err != nil { return nil, err @@ -225,9 +225,10 @@ func (s *accountsStatements) SelectNewNumericLocalpart( func (s *accountsStatements) SelectPrivacyPolicy( ctx context.Context, txn *sql.Tx, localPart string, ) (policy string, err error) { + var policyNull sql.NullString stmt := sqlutil.TxStmt(txn, s.selectPrivacyPolicyStmt) - err = stmt.QueryRowContext(ctx, localPart).Scan(&policy) - return + err = stmt.QueryRowContext(ctx, localPart).Scan(&policyNull) + return policyNull.String, err } // batchSelectPrivacyPolicy queries all users which didn't accept the current policy version