From 2d8ae480638e8474033fc08a5dbf1c8e9cfeec90 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Fri, 15 May 2020 21:35:09 +0200 Subject: [PATCH] Fixes old promotions not being displayed in the total Resolves https://github.com/brave/brave-browser/issues/9796 --- .../ledger/internal/database/database_unblinded_token.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_unblinded_token.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_unblinded_token.cc index 9deeb83c30e2..aa7485891a76 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_unblinded_token.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_unblinded_token.cc @@ -441,8 +441,8 @@ void DatabaseUnblindedToken::GetRecordsByTriggerIds( const std::string query = base::StringPrintf( "SELECT ut.token_id, ut.token_value, ut.public_key, ut.value, " "ut.creds_id, ut.expires_at FROM %s as ut " - "INNER JOIN creds_batch as cb ON cb.creds_id = ut.creds_id " - "WHERE cb.trigger_id IN (%s)", + "LEFT JOIN creds_batch as cb ON cb.creds_id = ut.creds_id " + "WHERE cb.trigger_id IN (%s) OR ut.creds_id IS NULL", kTableName, GenerateStringInCase(trigger_ids).c_str()); @@ -523,10 +523,10 @@ void DatabaseUnblindedToken::GetSpendableRecordListByBatchTypes( const std::string query = base::StringPrintf( "SELECT ut.token_id, ut.token_value, ut.public_key, ut.value, " "ut.creds_id, ut.expires_at FROM %s as ut " - "INNER JOIN creds_batch as cb ON cb.creds_id = ut.creds_id " + "LEFT JOIN creds_batch as cb ON cb.creds_id = ut.creds_id " "WHERE ut.redeemed_at = 0 AND " "(ut.expires_at > strftime('%%s','now') OR ut.expires_at = 0) AND " - "cb.trigger_type IN (%s)", + "(cb.trigger_type IN (%s) OR ut.creds_id IS NULL)", kTableName, base::JoinString(in_case, ",").c_str());