status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix/no such column FALSE (#3813) 

* fixed: "no such column: FALSE"

* bump version
This commit is contained in:
frank 2023-07-27 17:36:46 +08:00 committed by GitHub
parent cec81796dc
commit 07a3726b1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.162.11 0.162.12

40
multiaccounts/accounts/database.go
View File

@ -454,10 +454,10 @@ func (db *Database) getKeypairs(tx *sql.Tx, keyUID string, includeRemoved bool)
if keyUID != "" { if keyUID != "" {
where = "WHERE k.key_uid = ?" where = "WHERE k.key_uid = ?"
if !includeRemoved { if !includeRemoved {
where += " AND k.removed = FALSE" where += " AND k.removed = 0"
} }
} else if !includeRemoved { } else if !includeRemoved {
where = "WHERE k.removed = FALSE" where = "WHERE k.removed = 0"
} }
query := fmt.Sprintf( // nolint: gosec query := fmt.Sprintf( // nolint: gosec
@ -487,7 +487,7 @@ func (db *Database) getKeypairs(tx *sql.Tx, keyUID string, includeRemoved bool)
FROM FROM
keypairs_accounts keypairs_accounts
WHERE WHERE
removed = FALSE removed = 0
) AS ka ) AS ka
ON ON
k.key_uid = ka.key_uid k.key_uid = ka.key_uid
@ -556,10 +556,10 @@ func (db *Database) getAccounts(tx *sql.Tx, address types.Address, includeRemove
if filterByAddress { if filterByAddress {
where = "WHERE ka.address = ?" where = "WHERE ka.address = ?"
if !includeRemoved { if !includeRemoved {
where += " AND ka.removed = FALSE" where += " AND ka.removed = 0"
} }
} else if !includeRemoved { } else if !includeRemoved {
where = "WHERE ka.removed = FALSE" where = "WHERE ka.removed = 0"
} }
query := fmt.Sprintf( // nolint: gosec query := fmt.Sprintf( // nolint: gosec
@ -653,7 +653,7 @@ func (db *Database) markAccountRemoved(tx *sql.Tx, address types.Address, clock
UPDATE UPDATE
keypairs_accounts keypairs_accounts
SET SET
removed = TRUE, removed = 1,
clock = ? clock = ?
WHERE WHERE
address = ? address = ?
@ -692,7 +692,7 @@ func (db *Database) markKeypairRemoved(tx *sql.Tx, keyUID string, clock uint64)
UPDATE UPDATE
keypairs keypairs
SET SET
removed = TRUE, removed = 1,
clock = ? clock = ?
WHERE WHERE
key_uid = ? key_uid = ?
@ -1138,7 +1138,7 @@ func (db *Database) GetWalletAddress() (rst types.Address, err error) {
} }
func (db *Database) GetWalletAddresses() (rst []types.Address, err error) { func (db *Database) GetWalletAddresses() (rst []types.Address, err error) {
rows, err := db.db.Query("SELECT address FROM keypairs_accounts WHERE chat = 0 AND removed = FALSE ORDER BY created_at") rows, err := db.db.Query("SELECT address FROM keypairs_accounts WHERE chat = 0 AND removed = 0 ORDER BY created_at")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1166,7 +1166,7 @@ func (db *Database) GetChatAddress() (rst types.Address, err error) {
} }
func (db *Database) GetAddresses() (rst []types.Address, err error) { func (db *Database) GetAddresses() (rst []types.Address, err error) {
rows, err := db.db.Query("SELECT address FROM keypairs_accounts WHERE removed = FALSE ORDER BY created_at") rows, err := db.db.Query("SELECT address FROM keypairs_accounts WHERE removed = 0 ORDER BY created_at")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1189,7 +1189,7 @@ func (db *Database) GetAddresses() (rst []types.Address, err error) {
} }
func (db *Database) keypairExists(tx *sql.Tx, keyUID string) (exists bool, err error) { func (db *Database) keypairExists(tx *sql.Tx, keyUID string) (exists bool, err error) {
query := `SELECT EXISTS (SELECT 1 FROM keypairs WHERE key_uid = ? AND removed = FALSE)` query := `SELECT EXISTS (SELECT 1 FROM keypairs WHERE key_uid = ? AND removed = 0)`
if tx == nil { if tx == nil {
err = db.db.QueryRow(query, keyUID).Scan(&exists) err = db.db.QueryRow(query, keyUID).Scan(&exists)
@ -1207,13 +1207,13 @@ func (db *Database) KeypairExists(keyUID string) (exists bool, err error) {
// AddressExists returns true if given address is stored in database. // AddressExists returns true if given address is stored in database.
func (db *Database) AddressExists(address types.Address) (exists bool, err error) { func (db *Database) AddressExists(address types.Address) (exists bool, err error) {
err = db.db.QueryRow("SELECT EXISTS (SELECT 1 FROM keypairs_accounts WHERE address = ? AND removed = FALSE)", address).Scan(&exists) err = db.db.QueryRow("SELECT EXISTS (SELECT 1 FROM keypairs_accounts WHERE address = ? AND removed = 0)", address).Scan(&exists)
return exists, err return exists, err
} }
// GetPath returns true if account with given address was recently key and doesn't have a key yet // GetPath returns true if account with given address was recently key and doesn't have a key yet
func (db *Database) GetPath(address types.Address) (path string, err error) { func (db *Database) GetPath(address types.Address) (path string, err error) {
err = db.db.QueryRow("SELECT path FROM keypairs_accounts WHERE address = ? AND removed = FALSE", address).Scan(&path) err = db.db.QueryRow("SELECT path FROM keypairs_accounts WHERE address = ? AND removed = 0", address).Scan(&path)
return path, err return path, err
} }
@ -1246,7 +1246,7 @@ func (db *Database) SetAccountOperability(address types.Address, operable Accoun
func (db *Database) GetPositionForNextNewAccount() (int64, error) { func (db *Database) GetPositionForNextNewAccount() (int64, error) {
var pos sql.NullInt64 var pos sql.NullInt64
err := db.db.QueryRow("SELECT MAX(position) FROM keypairs_accounts WHERE removed = FALSE").Scan(&pos) err := db.db.QueryRow("SELECT MAX(position) FROM keypairs_accounts WHERE removed = 0").Scan(&pos)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -1387,7 +1387,7 @@ func (db *Database) MoveWalletAccount(fromPosition int64, toPosition int64, cloc
newMaxPosition int64 newMaxPosition int64
newMinPosition int64 newMinPosition int64
) )
err = tx.QueryRow("SELECT MAX(position), MIN(position) FROM keypairs_accounts WHERE removed = FALSE").Scan(&newMaxPosition, &newMinPosition) err = tx.QueryRow("SELECT MAX(position), MIN(position) FROM keypairs_accounts WHERE removed = 0").Scan(&newMaxPosition, &newMinPosition)
if err != nil { if err != nil {
return err return err
} }
@ -1395,32 +1395,32 @@ func (db *Database) MoveWalletAccount(fromPosition int64, toPosition int64, cloc
newMinPosition-- newMinPosition--
if toPosition > fromPosition { if toPosition > fromPosition {
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", newMaxPosition, fromPosition) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", newMaxPosition, fromPosition)
if err != nil { if err != nil {
return err return err
} }
for i := fromPosition + 1; i <= toPosition; i++ { for i := fromPosition + 1; i <= toPosition; i++ {
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", i-1, i) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", i-1, i)
if err != nil { if err != nil {
return err return err
} }
} }
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", toPosition, newMaxPosition) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", toPosition, newMaxPosition)
if err != nil { if err != nil {
return err return err
} }
} else { } else {
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", newMinPosition, fromPosition) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", newMinPosition, fromPosition)
if err != nil { if err != nil {
return err return err
} }
for i := fromPosition - 1; i >= toPosition; i-- { for i := fromPosition - 1; i >= toPosition; i-- {
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", i+1, i) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", i+1, i)
if err != nil { if err != nil {
return err return err
} }
} }
_, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = FALSE", toPosition, newMinPosition) _, err = tx.Exec("UPDATE keypairs_accounts SET position = ? WHERE position = ? AND removed = 0", toPosition, newMinPosition)
if err != nil { if err != nil {
return err return err
} }