Remove operator overloads from Statement.

Fix leftover users of operators.

R=shess@chromium.org
BUG=None
TEST=sql_unittests,unit_tests


Review URL: http://codereview.chromium.org/9433022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123609 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 9 deletions

diff --git a/sql/connection.cc b/sql/connection.cc
index 58819a7..07e6af2 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -230,10 +230,11 @@ int Connection::ExecuteAndReturnErrorCode(const char* sql) {
 
 bool Connection::Execute(const char* sql) {
   int error = ExecuteAndReturnErrorCode(sql);
-  // TODO(shess,gbillock): DLOG(FATAL) once Execute() clients are
-  // converted.
+  // This needs to be a FATAL log because the error case of arriving here is
+  // that there's a malformed SQL statement. This can arise in development if
+  // a change alters the schema but not all queries adjust.
   if (error == SQLITE_ERROR)
-    DLOG(ERROR) << "SQL Error in " << sql << ", " << GetErrorMessage();
+    DLOG(FATAL) << "SQL Error in " << sql << ", " << GetErrorMessage();
   return error == SQLITE_OK;
 }
 
@@ -310,6 +311,7 @@ bool Connection::DoesTableOrIndexExist(
       "WHERE type=? AND name=?"));
   statement.BindString(0, type);
   statement.BindString(1, name);
+
   return statement.Step();  // Table exists if any row was returned.
 }
 
diff --git a/sql/statement.h b/sql/statement.h
index 5b4ff92..92d1ef2 100644
--- a/sql/statement.h
+++ b/sql/statement.h
@@ -66,12 +66,6 @@ class SQL_EXPORT Statement {
   // has to be reset.
   bool is_valid() const { return ref_->is_valid(); }
 
-  // These operators allow conveniently checking if the statement is valid
-  // or not. See the pattern above for an example.
-  // TODO(shess,gbillock): Remove these once clients are converted.
-  operator bool() const { return is_valid(); }
-  bool operator!() const { return !is_valid(); }
-
   // Running -------------------------------------------------------------------
 
   // Executes the statement, returning true on success. This is like Step but