From 8d8d2c6691ad0ef4d1d96b263179ecb8d53ab5ee Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 9 Jun 2012 18:14:32 -0700 Subject: [PATCH] Bugfixes. --- src/LedgerConsensus.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index bd15efe5f9..ea148163e4 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -731,7 +731,7 @@ void LedgerConsensus::accept(SHAMap::pointer set) // Insert the transactions in set into the AcctTxn database Database *db = theApp->getAcctTxnDB()->getDB(); ScopedLock dbLock = theApp->getAcctTxnDB()->getDBLock(); - db->executeSQL("BEGIN TRANSACTION"); + db->executeSQL("BEGIN TRANSACTION;"); for (SHAMapItem::pointer item = set->peekFirstItem(); !!item; item = set->peekNextItem(item->getTag())) { SerializerIterator sit(item->peekSerializer()); @@ -742,19 +742,25 @@ void LedgerConsensus::accept(SHAMap::pointer set) bool first = true; for (std::vector::iterator it = accts.begin(), end = accts.end(); it != end; ++it) { - if (!first) sql += ", ("; - else sql += "("; + if (!first) + sql += ", ("; + else + { + sql += "('"; + first = false; + } sql += txn.getTransactionID().GetHex(); - sql += ","; + sql += "','"; sql += it->humanAccountID(); - sql += ","; + sql += "','"; sql += boost::lexical_cast(newLedgerSeq); - sql += ")"; + sql += "')"; } sql += ";"; + Log(lsTRACE) << "ActTx: " << sql; db->executeSQL(sql); } - db->executeSQL("COMMIT TRANSACTION"); + db->executeSQL("COMMIT TRANSACTION;"); } void LedgerConsensus::endConsensus()