Fix ambiguous column names in token-transaction SQL JOINs

Signed-off-by: Soumya Mohapatra <mohapatras@microsoft.com>

Author: Soumya Mohapatra

token/services/storage/db/sql/common/tokens.go

@@ -644,16 +644,16 @@ func (db *TokenStore) ListRedeemedTokens(ctx context.Context, tokenType token.Ty
 		cond.Eq("action_type", int(driver.Redeem)),
 	}
 	if len(tokenType) != 0 {
-		conds = append(conds, cond.Eq("token_type", tokenType))
+		conds = append(conds, cond.CmpVal(tokTable.Field("token_type"), "=", tokenType))
 	}
 	if len(issuerRaw) != 0 {
 		conds = append(conds, cond.Eq("issuer_raw", issuerRaw))
 	}
 	if from != nil {
-		conds = append(conds, cond.Gte("stored_at", from.UTC()))
+		conds = append(conds, cond.CmpVal(tokTable.Field("stored_at"), ">=", from.UTC()))
 	}
 	if to != nil {
-		conds = append(conds, cond.Lte("stored_at", to.UTC()))
+		conds = append(conds, cond.CmpVal(tokTable.Field("stored_at"), "<=", to.UTC()))
 	}
 	sel := q.Select().
 		Fields(
@@ -668,9 +668,9 @@ func (db *TokenStore) ListRedeemedTokens(ctx context.Context, tokenType token.Ty
 	var args []any
 	if sortBy == tdriver.SortByQuantity {
 		if sortDirection == tdriver.SortDescending {
-			query, args = sel.OrderBy(q.Desc(common3.FieldName("amount"))).Format(db.ci)
+			query, args = sel.OrderBy(q.Desc(tokTable.Field("amount"))).Format(db.ci)
 		} else {
-			query, args = sel.OrderBy(q.Asc(common3.FieldName("amount"))).Format(db.ci)
+			query, args = sel.OrderBy(q.Asc(tokTable.Field("amount"))).Format(db.ci)
 		}
 	} else {
 		query, args = sel.Format(db.ci)
@@ -704,19 +704,19 @@ func (db *TokenStore) RedeemedBalance(ctx context.Context, tokenType token.Type,
 		cond.Eq("action_type", int(driver.Redeem)),
 	}
 	if len(tokenType) != 0 {
-		conds = append(conds, cond.Eq("token_type", tokenType))
+		conds = append(conds, cond.CmpVal(tokTable.Field("token_type"), "=", tokenType))
 	}
 	if len(issuerRaw) != 0 {
 		conds = append(conds, cond.Eq("issuer_raw", issuerRaw))
 	}
 	if from != nil {
-		conds = append(conds, cond.Gte("stored_at", from.UTC()))
+		conds = append(conds, cond.CmpVal(tokTable.Field("stored_at"), ">=", from.UTC()))
 	}
 	if to != nil {
-		conds = append(conds, cond.Lte("stored_at", to.UTC()))
+		conds = append(conds, cond.CmpVal(tokTable.Field("stored_at"), "<=", to.UTC()))
 	}
 	query, args := q.Select().
-		FieldsByName("SUM(amount)").
+		FieldsByName(common3.FieldName("SUM(" + db.table.Tokens + ".amount)")).
 		From(tokTable.Join(txTable, cond.Cmp(tokTable.Field("spent_by"), "=", txTable.Field("tx_id")))).
 		Where(cond.And(conds...)).
 		Format(db.ci)