Implement sql::Connection::RazeAndClose().

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"
 
 namespace sql {
 
 // This empty constructor initializes our reference with an empty one so that
 // we don't have to NULL-check the ref_ to see if the statement is valid: we
 // only have to check the ref's validity bit.
 Statement::Statement()
-    : ref_(new Connection::StatementRef),
+    : ref_(new Connection::StatementRef(NULL, NULL, false)),
       succeeded_(false) {
 }
 
 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(true);
 }
 
 void Statement::Assign(scoped_refptr<Connection::StatementRef> ref) {
   Reset(true);
   ref_ = ref;
 }
 
 void Statement::Clear() {
-  Assign(new Connection::StatementRef);
+  Assign(new Connection::StatementRef(NULL, NULL, false));
   succeeded_ = false;
 }
 
 bool Statement::CheckValid() const {
-  if (!is_valid())
-    DLOG(FATAL) << "Cannot call mutating statements on an invalid statement.";
+  // Allow operations to fail silently if a statement was invalidated
+  // because the database was closed by an error handler.
+  DLOG_IF(FATAL, !ref_->was_valid())
+      << "Cannot call mutating statements on an invalid statement.";
   return is_valid();
 }
 
 bool Statement::Run() {
   ref_->AssertIOAllowed();
   if (!CheckValid())
     return false;
 
   return CheckError(sqlite3_step(ref_->stmt())) == SQLITE_DONE;
 }
@@ skipping 242 matching lines @@
   // TODO(gbillock,shess): make this invalidate the statement so it
   // can't wreak havoc.
   if (err == SQLITE_RANGE)
     DLOG(FATAL) << "Bind value out of range";
   return err == SQLITE_OK;
 }
 
 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() && ref_->connection())
+  if (!succeeded_ && ref_ && ref_->connection())
     return ref_->connection()->OnSqliteError(err, this);
   return err;
 }
 
 }  // namespace sql