From 7e286839bb6205e2c12e21a4b841a69d0842833e Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 18 Jun 2012 10:30:10 -0700 Subject: [PATCH] Suppress SQL errors in two cases where they are normal. --- src/Ledger.cpp | 2 +- src/Transaction.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Ledger.cpp b/src/Ledger.cpp index aa57d6937..f0e9d5f37 100644 --- a/src/Ledger.cpp +++ b/src/Ledger.cpp @@ -292,7 +292,7 @@ void Ledger::saveAcceptedLedger(Ledger::pointer ledger) } sql += ";"; Log(lsTRACE) << "ActTx: " << sql; - db->executeSQL(sql); + db->executeSQL(sql, true); // may already be in there if (!db->executeSQL( txn.getSQLInsertHeader() + txn.getSQL(ledger->getLedgerSeq(), TXN_SQL_VALIDATED) + ";"), true) { // transaction already in DB, update diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 355a6a2fa..5a3b87e42 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -525,7 +525,8 @@ bool Transaction::save() Database *db = theApp->getTxnDB()->getDB(); ScopedLock dbLock = theApp->getTxnDB()->getDBLock(); - return db->executeSQL(mTransaction->getSQLInsertHeader() + mTransaction->getSQL(getLedger(), status) + ";"); + return + db->executeSQL(mTransaction->getSQLInsertHeader() + mTransaction->getSQL(getLedger(), status) + ";", true); } Transaction::pointer Transaction::transactionFromSQL(const std::string& sql)