Changed to Reset(bool clear_bound_vars)

sql/statement.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sql/statement.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/sqlite/sqlite3.h"
@@ skipping 10 matching lines @@
 
 Statement::Statement(scoped_refptr<Connection::StatementRef> ref)
     : ref_(ref),
       succeeded_(false) {
 }
 
 Statement::~Statement() {
   // Free the resources associated with this statement. We assume there's only
   // one statement active for a given sqlite3_stmt at any time, so this won't
   // mess with anything.
-  Reset();
+  Reset(true);
 }
 
 void Statement::Assign(scoped_refptr<Connection::StatementRef> ref) {
-  Reset();
+  Reset(true);
   ref_ = ref;
 }
 
 void Statement::Clear() {
   Assign(new Connection::StatementRef);
   succeeded_ = false;
 }
 
 bool Statement::CheckValid() const {
   if (!is_valid())
     DLOG(FATAL) << "Cannot call mutating statements on an invalid statement.";
   return is_valid();
 }
 
 bool Statement::Run() {
   if (!CheckValid())
     return false;
 
   return CheckError(sqlite3_step(ref_->stmt())) == SQLITE_DONE;
 }
 
 bool Statement::Step() {
   if (!CheckValid())
     return false;
 
   return CheckError(sqlite3_step(ref_->stmt())) == SQLITE_ROW;
 }
 
-void Statement::Reset() {
+void Statement::Reset(bool clear_bound_vars) {
   if (is_valid()) {
     // We don't call CheckError() here because sqlite3_reset() returns
     // the last error that Step() caused thereby generating a second
     // spurious error callback.
-    sqlite3_clear_bindings(ref_->stmt());
+    if (clear_bound_vars)
+      sqlite3_clear_bindings(ref_->stmt());
     sqlite3_reset(ref_->stmt());
   }
 
   succeeded_ = false;
 }
 
 bool Statement::Succeeded() const {
   if (!is_valid())
     return false;
 
@@ skipping 221 matching lines @@
 
 int Statement::CheckError(int err) {
   // Please don't add DCHECKs here, OnSqliteError() already has them.
   succeeded_ = (err == SQLITE_OK || err == SQLITE_ROW || err == SQLITE_DONE);
   if (!succeeded_ && is_valid())
     return ref_->connection()->OnSqliteError(err, this);
   return err;
 }
 
 }  // namespace sql