From bc5481a2497d84aaf6398efb65e555f90ef48794 Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 22 Mar 2023 15:17:27 -0400 Subject: [PATCH] self -> str --- controller/store/account.go | 12 ++++++------ controller/store/accountLimitJournal.go | 6 +++--- controller/store/account_request.go | 18 +++++++++--------- controller/store/environment.go | 12 ++++++------ controller/store/environmentLimitJournal.go | 6 +++--- controller/store/password_reset_request.go | 14 +++++++------- controller/store/share.go | 16 ++++++++-------- controller/store/shareLimitJournal.go | 6 +++--- controller/store/store.go | 14 +++++++------- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/controller/store/account.go b/controller/store/account.go index 9872f943..4ccb7a94 100644 --- a/controller/store/account.go +++ b/controller/store/account.go @@ -15,7 +15,7 @@ type Account struct { Deleted bool } -func (self *Store) CreateAccount(a *Account, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateAccount(a *Account, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into accounts (email, salt, password, token, limitless) values ($1, $2, $3, $4, $5) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing accounts insert statement") @@ -27,7 +27,7 @@ func (self *Store) CreateAccount(a *Account, tx *sqlx.Tx) (int, error) { return id, nil } -func (self *Store) GetAccount(id int, tx *sqlx.Tx) (*Account, error) { +func (str *Store) GetAccount(id int, tx *sqlx.Tx) (*Account, error) { a := &Account{} if err := tx.QueryRowx("select * from accounts where id = $1", id).StructScan(a); err != nil { return nil, errors.Wrap(err, "error selecting account by id") @@ -35,7 +35,7 @@ func (self *Store) GetAccount(id int, tx *sqlx.Tx) (*Account, error) { return a, nil } -func (self *Store) FindAccountWithEmail(email string, tx *sqlx.Tx) (*Account, error) { +func (str *Store) FindAccountWithEmail(email string, tx *sqlx.Tx) (*Account, error) { a := &Account{} if err := tx.QueryRowx("select * from accounts where email = $1 and not deleted", email).StructScan(a); err != nil { return nil, errors.Wrap(err, "error selecting account by email") @@ -43,7 +43,7 @@ func (self *Store) FindAccountWithEmail(email string, tx *sqlx.Tx) (*Account, er return a, nil } -func (self *Store) FindAccountWithEmailAndDeleted(email string, tx *sqlx.Tx) (*Account, error) { +func (str *Store) FindAccountWithEmailAndDeleted(email string, tx *sqlx.Tx) (*Account, error) { a := &Account{} if err := tx.QueryRowx("select * from accounts where email = $1", email).StructScan(a); err != nil { return nil, errors.Wrap(err, "error selecting acount by email") @@ -51,7 +51,7 @@ func (self *Store) FindAccountWithEmailAndDeleted(email string, tx *sqlx.Tx) (*A return a, nil } -func (self *Store) FindAccountWithToken(token string, tx *sqlx.Tx) (*Account, error) { +func (str *Store) FindAccountWithToken(token string, tx *sqlx.Tx) (*Account, error) { a := &Account{} if err := tx.QueryRowx("select * from accounts where token = $1 and not deleted", token).StructScan(a); err != nil { return nil, errors.Wrap(err, "error selecting account by token") @@ -59,7 +59,7 @@ func (self *Store) FindAccountWithToken(token string, tx *sqlx.Tx) (*Account, er return a, nil } -func (self *Store) UpdateAccount(a *Account, tx *sqlx.Tx) (int, error) { +func (str *Store) UpdateAccount(a *Account, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("update accounts set email=$1, salt=$2, password=$3, token=$4, limitless=$5 where id = $6") if err != nil { return 0, errors.Wrap(err, "error preparing accounts update statement") diff --git a/controller/store/accountLimitJournal.go b/controller/store/accountLimitJournal.go index 9bf6881b..10d96464 100644 --- a/controller/store/accountLimitJournal.go +++ b/controller/store/accountLimitJournal.go @@ -13,7 +13,7 @@ type AccountLimitJournal struct { Action LimitJournalAction } -func (self *Store) CreateAccountLimitJournal(j *AccountLimitJournal, trx *sqlx.Tx) (int, error) { +func (str *Store) CreateAccountLimitJournal(j *AccountLimitJournal, trx *sqlx.Tx) (int, error) { stmt, err := trx.Prepare("insert into account_limit_journal (account_id, rx_bytes, tx_bytes, action) values ($1, $2, $3, $4) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing account_limit_journal insert statement") @@ -25,7 +25,7 @@ func (self *Store) CreateAccountLimitJournal(j *AccountLimitJournal, trx *sqlx.T return id, nil } -func (self *Store) IsAccountLimitJournalEmpty(acctId int, trx *sqlx.Tx) (bool, error) { +func (str *Store) IsAccountLimitJournalEmpty(acctId int, trx *sqlx.Tx) (bool, error) { count := 0 if err := trx.QueryRowx("select count(0) from account_limit_journal where account_id = $1", acctId).Scan(&count); err != nil { return false, err @@ -33,7 +33,7 @@ func (self *Store) IsAccountLimitJournalEmpty(acctId int, trx *sqlx.Tx) (bool, e return count == 0, nil } -func (self *Store) FindLatestAccountLimitJournal(acctId int, trx *sqlx.Tx) (*AccountLimitJournal, error) { +func (str *Store) FindLatestAccountLimitJournal(acctId int, trx *sqlx.Tx) (*AccountLimitJournal, error) { j := &AccountLimitJournal{} if err := trx.QueryRowx("select * from account_limit_journal where account_id = $1 order by id desc limit 1", acctId).StructScan(j); err != nil { return nil, errors.Wrap(err, "error finding account_limit_journal by account_id") diff --git a/controller/store/account_request.go b/controller/store/account_request.go index 9b3f1961..edc664b8 100644 --- a/controller/store/account_request.go +++ b/controller/store/account_request.go @@ -17,7 +17,7 @@ type AccountRequest struct { Deleted bool } -func (self *Store) CreateAccountRequest(ar *AccountRequest, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateAccountRequest(ar *AccountRequest, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into account_requests (token, email, source_address) values ($1, $2, $3) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing account_requests insert statement") @@ -29,7 +29,7 @@ func (self *Store) CreateAccountRequest(ar *AccountRequest, tx *sqlx.Tx) (int, e return id, nil } -func (self *Store) GetAccountRequest(id int, tx *sqlx.Tx) (*AccountRequest, error) { +func (str *Store) GetAccountRequest(id int, tx *sqlx.Tx) (*AccountRequest, error) { ar := &AccountRequest{} if err := tx.QueryRowx("select * from account_requests where id = $1", id).StructScan(ar); err != nil { return nil, errors.Wrap(err, "error selecting account_request by id") @@ -37,7 +37,7 @@ func (self *Store) GetAccountRequest(id int, tx *sqlx.Tx) (*AccountRequest, erro return ar, nil } -func (self *Store) FindAccountRequestWithToken(token string, tx *sqlx.Tx) (*AccountRequest, error) { +func (str *Store) FindAccountRequestWithToken(token string, tx *sqlx.Tx) (*AccountRequest, error) { ar := &AccountRequest{} if err := tx.QueryRowx("select * from account_requests where token = $1 and not deleted", token).StructScan(ar); err != nil { return nil, errors.Wrap(err, "error selecting account_request by token") @@ -45,9 +45,9 @@ func (self *Store) FindAccountRequestWithToken(token string, tx *sqlx.Tx) (*Acco return ar, nil } -func (self *Store) FindExpiredAccountRequests(before time.Time, limit int, tx *sqlx.Tx) ([]*AccountRequest, error) { +func (str *Store) FindExpiredAccountRequests(before time.Time, limit int, tx *sqlx.Tx) ([]*AccountRequest, error) { var sql string - switch self.cfg.Type { + switch str.cfg.Type { case "postgres": sql = "select * from account_requests where created_at < $1 and not deleted limit %d for update" @@ -55,7 +55,7 @@ func (self *Store) FindExpiredAccountRequests(before time.Time, limit int, tx *s sql = "select * from account_requests where created_at < $1 and not deleted limit %d" default: - return nil, errors.Errorf("unknown database type '%v'", self.cfg.Type) + return nil, errors.Errorf("unknown database type '%v'", str.cfg.Type) } rows, err := tx.Queryx(fmt.Sprintf(sql, limit), before) @@ -73,7 +73,7 @@ func (self *Store) FindExpiredAccountRequests(before time.Time, limit int, tx *s return ars, nil } -func (self *Store) FindAccountRequestWithEmail(email string, tx *sqlx.Tx) (*AccountRequest, error) { +func (str *Store) FindAccountRequestWithEmail(email string, tx *sqlx.Tx) (*AccountRequest, error) { ar := &AccountRequest{} if err := tx.QueryRowx("select * from account_requests where email = $1 and not deleted", email).StructScan(ar); err != nil { return nil, errors.Wrap(err, "error selecting account_request by email") @@ -81,7 +81,7 @@ func (self *Store) FindAccountRequestWithEmail(email string, tx *sqlx.Tx) (*Acco return ar, nil } -func (self *Store) DeleteAccountRequest(id int, tx *sqlx.Tx) error { +func (str *Store) DeleteAccountRequest(id int, tx *sqlx.Tx) error { stmt, err := tx.Prepare("update account_requests set deleted = true, updated_at = current_timestamp where id = $1") if err != nil { return errors.Wrap(err, "error preparing account_requests delete statement") @@ -93,7 +93,7 @@ func (self *Store) DeleteAccountRequest(id int, tx *sqlx.Tx) error { return nil } -func (self *Store) DeleteMultipleAccountRequests(ids []int, tx *sqlx.Tx) error { +func (str *Store) DeleteMultipleAccountRequests(ids []int, tx *sqlx.Tx) error { if len(ids) == 0 { return nil } diff --git a/controller/store/environment.go b/controller/store/environment.go index 4c3e47c0..4ee783a3 100644 --- a/controller/store/environment.go +++ b/controller/store/environment.go @@ -15,7 +15,7 @@ type Environment struct { Deleted bool } -func (self *Store) CreateEnvironment(accountId int, i *Environment, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateEnvironment(accountId int, i *Environment, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into environments (account_id, description, host, address, z_id) values ($1, $2, $3, $4, $5) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing environments insert statement") @@ -27,7 +27,7 @@ func (self *Store) CreateEnvironment(accountId int, i *Environment, tx *sqlx.Tx) return id, nil } -func (self *Store) CreateEphemeralEnvironment(i *Environment, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateEphemeralEnvironment(i *Environment, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into environments (description, host, address, z_id) values ($1, $2, $3, $4) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing environments (ephemeral) insert statement") @@ -39,7 +39,7 @@ func (self *Store) CreateEphemeralEnvironment(i *Environment, tx *sqlx.Tx) (int, return id, nil } -func (self *Store) GetEnvironment(id int, tx *sqlx.Tx) (*Environment, error) { +func (str *Store) GetEnvironment(id int, tx *sqlx.Tx) (*Environment, error) { i := &Environment{} if err := tx.QueryRowx("select * from environments where id = $1", id).StructScan(i); err != nil { return nil, errors.Wrap(err, "error selecting environment by id") @@ -47,7 +47,7 @@ func (self *Store) GetEnvironment(id int, tx *sqlx.Tx) (*Environment, error) { return i, nil } -func (self *Store) FindEnvironmentsForAccount(accountId int, tx *sqlx.Tx) ([]*Environment, error) { +func (str *Store) FindEnvironmentsForAccount(accountId int, tx *sqlx.Tx) ([]*Environment, error) { rows, err := tx.Queryx("select environments.* from environments where account_id = $1 and not deleted", accountId) if err != nil { return nil, errors.Wrap(err, "error selecting environments by account id") @@ -63,7 +63,7 @@ func (self *Store) FindEnvironmentsForAccount(accountId int, tx *sqlx.Tx) ([]*En return is, nil } -func (self *Store) FindEnvironmentForAccount(envZId string, accountId int, tx *sqlx.Tx) (*Environment, error) { +func (str *Store) FindEnvironmentForAccount(envZId string, accountId int, tx *sqlx.Tx) (*Environment, error) { env := &Environment{} if err := tx.QueryRowx("select environments.* from environments where z_id = $1 and account_id = $2 and not deleted", envZId, accountId).StructScan(env); err != nil { return nil, errors.Wrap(err, "error finding environment by z_id and account_id") @@ -71,7 +71,7 @@ func (self *Store) FindEnvironmentForAccount(envZId string, accountId int, tx *s return env, nil } -func (self *Store) DeleteEnvironment(id int, tx *sqlx.Tx) error { +func (str *Store) DeleteEnvironment(id int, tx *sqlx.Tx) error { stmt, err := tx.Prepare("update environments set updated_at = current_timestamp, deleted = true where id = $1") if err != nil { return errors.Wrap(err, "error preparing environments delete statement") diff --git a/controller/store/environmentLimitJournal.go b/controller/store/environmentLimitJournal.go index 73cbbd62..75794185 100644 --- a/controller/store/environmentLimitJournal.go +++ b/controller/store/environmentLimitJournal.go @@ -13,7 +13,7 @@ type EnvironmentLimitJournal struct { Action LimitJournalAction } -func (self *Store) CreateEnvironmentLimitJournal(j *EnvironmentLimitJournal, trx *sqlx.Tx) (int, error) { +func (str *Store) CreateEnvironmentLimitJournal(j *EnvironmentLimitJournal, trx *sqlx.Tx) (int, error) { stmt, err := trx.Prepare("insert into environment_limit_journal (environment_id, rx_bytes, tx_bytes, action) values ($1, $2, $3, $4) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing environment_limit_journal insert statement") @@ -25,7 +25,7 @@ func (self *Store) CreateEnvironmentLimitJournal(j *EnvironmentLimitJournal, trx return id, nil } -func (self *Store) IsEnvironmentLimitJournalEmpty(envId int, trx *sqlx.Tx) (bool, error) { +func (str *Store) IsEnvironmentLimitJournalEmpty(envId int, trx *sqlx.Tx) (bool, error) { count := 0 if err := trx.QueryRowx("select count(0) from environment_limit_journal where environment_id = $1", envId).Scan(&count); err != nil { return false, err @@ -33,7 +33,7 @@ func (self *Store) IsEnvironmentLimitJournalEmpty(envId int, trx *sqlx.Tx) (bool return count == 0, nil } -func (self *Store) FindLatestEnvironmentLimitJournal(envId int, trx *sqlx.Tx) (*EnvironmentLimitJournal, error) { +func (str *Store) FindLatestEnvironmentLimitJournal(envId int, trx *sqlx.Tx) (*EnvironmentLimitJournal, error) { j := &EnvironmentLimitJournal{} if err := trx.QueryRowx("select * from environment_limit_journal where environment_id = $1 order by created_at desc limit 1", envId).StructScan(j); err != nil { return nil, errors.Wrap(err, "error finding environment_limit_journal by environment_id") diff --git a/controller/store/password_reset_request.go b/controller/store/password_reset_request.go index a5c617c5..a6a7b60d 100644 --- a/controller/store/password_reset_request.go +++ b/controller/store/password_reset_request.go @@ -16,7 +16,7 @@ type PasswordResetRequest struct { Deleted bool } -func (self *Store) CreatePasswordResetRequest(prr *PasswordResetRequest, tx *sqlx.Tx) (int, error) { +func (str *Store) CreatePasswordResetRequest(prr *PasswordResetRequest, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into password_reset_requests (account_id, token) values ($1, $2) ON CONFLICT(account_id) DO UPDATE SET token=$2 returning id") if err != nil { return 0, errors.Wrap(err, "error preparing password_reset_requests insert statement") @@ -28,7 +28,7 @@ func (self *Store) CreatePasswordResetRequest(prr *PasswordResetRequest, tx *sql return id, nil } -func (self *Store) FindPasswordResetRequestWithToken(token string, tx *sqlx.Tx) (*PasswordResetRequest, error) { +func (str *Store) FindPasswordResetRequestWithToken(token string, tx *sqlx.Tx) (*PasswordResetRequest, error) { prr := &PasswordResetRequest{} if err := tx.QueryRowx("select * from password_reset_requests where token = $1 and not deleted", token).StructScan(prr); err != nil { return nil, errors.Wrap(err, "error selecting password_reset_requests by token") @@ -36,16 +36,16 @@ func (self *Store) FindPasswordResetRequestWithToken(token string, tx *sqlx.Tx) return prr, nil } -func (self *Store) FindExpiredPasswordResetRequests(before time.Time, limit int, tx *sqlx.Tx) ([]*PasswordResetRequest, error) { +func (str *Store) FindExpiredPasswordResetRequests(before time.Time, limit int, tx *sqlx.Tx) ([]*PasswordResetRequest, error) { var sql string - switch self.cfg.Type { + switch str.cfg.Type { case "postgres": sql = "select * from password_reset_requests where created_at < $1 and not deleted limit %d for update" case "sqlite3": sql = "select * from password_reset_requests where created_at < $1 and not deleted limit %d" default: - return nil, errors.Errorf("unknown database type '%v'", self.cfg.Type) + return nil, errors.Errorf("unknown database type '%v'", str.cfg.Type) } rows, err := tx.Queryx(fmt.Sprintf(sql, limit), before) @@ -63,7 +63,7 @@ func (self *Store) FindExpiredPasswordResetRequests(before time.Time, limit int, return prrs, nil } -func (self *Store) DeletePasswordResetRequest(id int, tx *sqlx.Tx) error { +func (str *Store) DeletePasswordResetRequest(id int, tx *sqlx.Tx) error { stmt, err := tx.Prepare("update password_reset_requests set updated_at = current_timestamp, deleted = true where id = $1") if err != nil { return errors.Wrap(err, "error preparing password_reset_requests delete statement") @@ -75,7 +75,7 @@ func (self *Store) DeletePasswordResetRequest(id int, tx *sqlx.Tx) error { return nil } -func (self *Store) DeleteMultiplePasswordResetRequests(ids []int, tx *sqlx.Tx) error { +func (str *Store) DeleteMultiplePasswordResetRequests(ids []int, tx *sqlx.Tx) error { if len(ids) == 0 { return nil } diff --git a/controller/store/share.go b/controller/store/share.go index 86e55c61..8161fc2d 100644 --- a/controller/store/share.go +++ b/controller/store/share.go @@ -19,7 +19,7 @@ type Share struct { Deleted bool } -func (self *Store) CreateShare(envId int, shr *Share, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateShare(envId int, shr *Share, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into shares (environment_id, z_id, token, share_mode, backend_mode, frontend_selection, frontend_endpoint, backend_proxy_endpoint, reserved) values ($1, $2, $3, $4, $5, $6, $7, $8, $9) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing shares insert statement") @@ -31,7 +31,7 @@ func (self *Store) CreateShare(envId int, shr *Share, tx *sqlx.Tx) (int, error) return id, nil } -func (self *Store) GetShare(id int, tx *sqlx.Tx) (*Share, error) { +func (str *Store) GetShare(id int, tx *sqlx.Tx) (*Share, error) { shr := &Share{} if err := tx.QueryRowx("select * from shares where id = $1", id).StructScan(shr); err != nil { return nil, errors.Wrap(err, "error selecting share by id") @@ -39,7 +39,7 @@ func (self *Store) GetShare(id int, tx *sqlx.Tx) (*Share, error) { return shr, nil } -func (self *Store) FindAllShares(tx *sqlx.Tx) ([]*Share, error) { +func (str *Store) FindAllShares(tx *sqlx.Tx) ([]*Share, error) { rows, err := tx.Queryx("select * from shares where not deleted order by id") if err != nil { return nil, errors.Wrap(err, "error selecting all shares") @@ -55,7 +55,7 @@ func (self *Store) FindAllShares(tx *sqlx.Tx) ([]*Share, error) { return shrs, nil } -func (self *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, error) { +func (str *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, error) { shr := &Share{} if err := tx.QueryRowx("select * from shares where token = $1 and not deleted", shrToken).StructScan(shr); err != nil { return nil, errors.Wrap(err, "error selecting share by token") @@ -63,7 +63,7 @@ func (self *Store) FindShareWithToken(shrToken string, tx *sqlx.Tx) (*Share, err return shr, nil } -func (self *Store) FindShareWithZIdAndDeleted(zId string, tx *sqlx.Tx) (*Share, error) { +func (str *Store) FindShareWithZIdAndDeleted(zId string, tx *sqlx.Tx) (*Share, error) { shr := &Share{} if err := tx.QueryRowx("select * from shares where z_id = $1", zId).StructScan(shr); err != nil { return nil, errors.Wrap(err, "error selecting share by z_id") @@ -71,7 +71,7 @@ func (self *Store) FindShareWithZIdAndDeleted(zId string, tx *sqlx.Tx) (*Share, return shr, nil } -func (self *Store) FindSharesForEnvironment(envId int, tx *sqlx.Tx) ([]*Share, error) { +func (str *Store) FindSharesForEnvironment(envId int, tx *sqlx.Tx) ([]*Share, error) { rows, err := tx.Queryx("select shares.* from shares where environment_id = $1 and not deleted", envId) if err != nil { return nil, errors.Wrap(err, "error selecting shares by environment id") @@ -87,7 +87,7 @@ func (self *Store) FindSharesForEnvironment(envId int, tx *sqlx.Tx) ([]*Share, e return shrs, nil } -func (self *Store) UpdateShare(shr *Share, tx *sqlx.Tx) error { +func (str *Store) UpdateShare(shr *Share, tx *sqlx.Tx) error { sql := "update shares set z_id = $1, token = $2, share_mode = $3, backend_mode = $4, frontend_selection = $5, frontend_endpoint = $6, backend_proxy_endpoint = $7, reserved = $8, updated_at = current_timestamp where id = $9" stmt, err := tx.Prepare(sql) if err != nil { @@ -100,7 +100,7 @@ func (self *Store) UpdateShare(shr *Share, tx *sqlx.Tx) error { return nil } -func (self *Store) DeleteShare(id int, tx *sqlx.Tx) error { +func (str *Store) DeleteShare(id int, tx *sqlx.Tx) error { stmt, err := tx.Prepare("update shares set updated_at = current_timestamp, deleted = true where id = $1") if err != nil { return errors.Wrap(err, "error preparing shares delete statement") diff --git a/controller/store/shareLimitJournal.go b/controller/store/shareLimitJournal.go index 8ad3f6df..59891206 100644 --- a/controller/store/shareLimitJournal.go +++ b/controller/store/shareLimitJournal.go @@ -13,7 +13,7 @@ type ShareLimitJournal struct { Action LimitJournalAction } -func (self *Store) CreateShareLimitJournal(j *ShareLimitJournal, tx *sqlx.Tx) (int, error) { +func (str *Store) CreateShareLimitJournal(j *ShareLimitJournal, tx *sqlx.Tx) (int, error) { stmt, err := tx.Prepare("insert into share_limit_journal (share_id, rx_bytes, tx_bytes, action) values ($1, $2, $3, $4) returning id") if err != nil { return 0, errors.Wrap(err, "error preparing share_limit_journal insert statement") @@ -25,7 +25,7 @@ func (self *Store) CreateShareLimitJournal(j *ShareLimitJournal, tx *sqlx.Tx) (i return id, nil } -func (self *Store) IsShareLimitJournalEmpty(shrId int, trx *sqlx.Tx) (bool, error) { +func (str *Store) IsShareLimitJournalEmpty(shrId int, trx *sqlx.Tx) (bool, error) { count := 0 if err := trx.QueryRowx("select count(0) from share_limit_journal where share_id = $1", shrId).Scan(&count); err != nil { return false, err @@ -33,7 +33,7 @@ func (self *Store) IsShareLimitJournalEmpty(shrId int, trx *sqlx.Tx) (bool, erro return count == 0, nil } -func (self *Store) FindLatestShareLimitJournal(shrId int, tx *sqlx.Tx) (*ShareLimitJournal, error) { +func (str *Store) FindLatestShareLimitJournal(shrId int, tx *sqlx.Tx) (*ShareLimitJournal, error) { j := &ShareLimitJournal{} if err := tx.QueryRowx("select * from share_limit_journal where share_id = $1 order by created_at desc limit 1", shrId).StructScan(j); err != nil { return nil, errors.Wrap(err, "error finding share_limit_journal by share_id") diff --git a/controller/store/store.go b/controller/store/store.go index 60e98f60..f56e7bf5 100644 --- a/controller/store/store.go +++ b/controller/store/store.go @@ -62,15 +62,15 @@ func Open(cfg *Config) (*Store, error) { return store, nil } -func (self *Store) Begin() (*sqlx.Tx, error) { - return self.db.Beginx() +func (str *Store) Begin() (*sqlx.Tx, error) { + return str.db.Beginx() } -func (self *Store) Close() error { - return self.db.Close() +func (str *Store) Close() error { + return str.db.Close() } -func (self *Store) migrate(cfg *Config) error { +func (str *Store) migrate(cfg *Config) error { switch cfg.Type { case "sqlite3": migrations := &migrate.EmbedFileSystemMigrationSource{ @@ -78,7 +78,7 @@ func (self *Store) migrate(cfg *Config) error { Root: "/", } migrate.SetTable("migrations") - n, err := migrate.Exec(self.db.DB, "sqlite3", migrations, migrate.Up) + n, err := migrate.Exec(str.db.DB, "sqlite3", migrations, migrate.Up) if err != nil { return errors.Wrap(err, "error running migrations") } @@ -90,7 +90,7 @@ func (self *Store) migrate(cfg *Config) error { Root: "/", } migrate.SetTable("migrations") - n, err := migrate.Exec(self.db.DB, "postgres", migrations, migrate.Up) + n, err := migrate.Exec(str.db.DB, "postgres", migrations, migrate.Up) if err != nil { return errors.Wrap(err, "error running migrations") }