Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update expensify_prod branch #1684

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Update expensify_prod branch #1684

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b736dce
Fix constraints warning
tylerkaraszewski Mar 21, 2024
f8485ed
Lost an S
tylerkaraszewski Mar 21, 2024
7bb1389
Merge pull request #1683 from Expensify/tyler-fix-constraints-warning
iwiznia Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion libstuff/libstuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,7 +2687,13 @@ int SQuery(sqlite3* db, const char* e, const string& sql, SQResult& result, int6
string sqlToLog = sql.substr(0, 20000);
SRedactSensitiveValues(sqlToLog);

SWARN("'" << e << "', query failed with error #" << error << " (" << sqlite3_errmsg(db) << "): " << sqlToLog);
// We don't warn for constraints errors because sometimes they're allowed, and BedrockCore.cpp will warn for the ones that aren't.
// This prevents creating bugbot issues for the allowed cases. We still log as INFO though so we can diagnose the query with the problem.
if (error == SQLITE_CONSTRAINT) {
SINFO("'" << e << "', query failed with error #" << error << " (" << sqlite3_errmsg(db) << "): " << sqlToLog);
} else {
SWARN("'" << e << "', query failed with error #" << error << " (" << sqlite3_errmsg(db) << "): " << sqlToLog);
}
}

// But we log for commit conflicts as well, to keep track of how often this happens with this experimental feature.
Expand Down