From 24d8df664c21fa8bd68d80b5585a496e264c410a Mon Sep 17 00:00:00 2001 From: Kegsay Date: Thu, 21 May 2020 14:40:13 +0100 Subject: Fix #897 and shuffle directory around (#1054) * Fix #897 and shuffle directory around * Update find-lint * goimports Co-authored-by: Neil Alexander --- syncapi/storage/postgres/account_data_table.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'syncapi/storage/postgres/account_data_table.go') diff --git a/syncapi/storage/postgres/account_data_table.go b/syncapi/storage/postgres/account_data_table.go index a5e0c121..e0b87bd6 100644 --- a/syncapi/storage/postgres/account_data_table.go +++ b/syncapi/storage/postgres/account_data_table.go @@ -20,7 +20,7 @@ import ( "database/sql" "github.com/lib/pq" - "github.com/matrix-org/dendrite/common" + "github.com/matrix-org/dendrite/internal" "github.com/matrix-org/dendrite/syncapi/storage/tables" "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" @@ -113,7 +113,7 @@ func (s *accountDataStatements) SelectAccountDataInRange( if err != nil { return } - defer common.CloseAndLogIfError(ctx, rows, "selectAccountDataInRange: rows.close() failed") + defer internal.CloseAndLogIfError(ctx, rows, "selectAccountDataInRange: rows.close() failed") for rows.Next() { var dataType string @@ -136,7 +136,7 @@ func (s *accountDataStatements) SelectMaxAccountDataID( ctx context.Context, txn *sql.Tx, ) (id int64, err error) { var nullableID sql.NullInt64 - stmt := common.TxStmt(txn, s.selectMaxAccountDataIDStmt) + stmt := internal.TxStmt(txn, s.selectMaxAccountDataIDStmt) err = stmt.QueryRowContext(ctx).Scan(&nullableID) if nullableID.Valid { id = nullableID.Int64 -- cgit v1.2.3