Put debugging assertions into sql::Statement.

sql/meta_table.cc

 // Copyright (c) 2011 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/meta_table.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
@@ skipping 33 matching lines @@
   }
   return true;
 }
 
 void MetaTable::Reset() {
   db_ = NULL;
 }
 
 bool MetaTable::SetValue(const char* key, const std::string& value) {
   Statement s;
-  if (!PrepareSetStatement(&s, key))
-    return false;
+  PrepareSetStatement(&s, key);
   s.BindString(1, value);
   return s.Run();
 }
 
 bool MetaTable::GetValue(const char* key, std::string* value) {
   Statement s;
   if (!PrepareGetStatement(&s, key))
     return false;
 
   *value = s.ColumnString(0);
   return true;
 }
 
 bool MetaTable::SetValue(const char* key, int value) {
   Statement s;
-  if (!PrepareSetStatement(&s, key))
-    return false;
-
+  PrepareSetStatement(&s, key);
   s.BindInt(1, value);
   return s.Run();
 }
 
 bool MetaTable::GetValue(const char* key, int* value) {
   Statement s;
   if (!PrepareGetStatement(&s, key))
     return false;
 
   *value = s.ColumnInt(0);
   return true;
 }
 
 bool MetaTable::SetValue(const char* key, int64 value) {
   Statement s;
-  if (!PrepareSetStatement(&s, key))
-    return false;
+  PrepareSetStatement(&s, key);
   s.BindInt64(1, value);
   return s.Run();
 }
 
 bool MetaTable::GetValue(const char* key, int64* value) {
   Statement s;
   if (!PrepareGetStatement(&s, key))
     return false;
 
   *value = s.ColumnInt64(0);
@@ skipping 15 matching lines @@
   SetValue(kCompatibleVersionKey, version);
 }
 
 int MetaTable::GetCompatibleVersionNumber() {
   int version = 0;
   if (!GetValue(kCompatibleVersionKey, &version))
     return 0;
   return version;
 }
 
-bool MetaTable::PrepareSetStatement(Statement* statement, const char* key) {
+void MetaTable::PrepareSetStatement(Statement* statement, const char* key) {
   DCHECK(db_ && statement);
   statement->Assign(db_->GetCachedStatement(SQL_FROM_HERE,
       "INSERT OR REPLACE INTO meta (key,value) VALUES (?,?)"));
-  if (!statement->is_valid()) {
-    NOTREACHED() << db_->GetErrorMessage();
-    return false;
-  }
   statement->BindCString(0, key);
-  return true;
 }
 
 bool MetaTable::PrepareGetStatement(Statement* statement, const char* key) {
   DCHECK(db_ && statement);
   statement->Assign(db_->GetCachedStatement(SQL_FROM_HERE,
       "SELECT value FROM meta WHERE key=?"));
-  if (!statement->is_valid()) {
-    NOTREACHED() << db_->GetErrorMessage();
-    return false;
-  }
   statement->BindCString(0, key);
   if (!statement->Step())
     return false;
   return true;
 }
 
 }  // namespace sql