Import SQLite 3.8.7.4.

sql/sqlite_features_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "sql/connection.h"
@@ skipping 27 matching lines @@
                                       &error_, &sql_text_));
   }
 
   void TearDown() override {
     // If any error happened the original sql statement can be found in
     // |sql_text_|.
     EXPECT_EQ(SQLITE_OK, error_) << sql_text_;
     db_.Close();
   }
 
-  void VerifyAndClearLastError(int expected_error) {
-    EXPECT_EQ(expected_error, error_);
-    error_ = SQLITE_OK;
-    sql_text_.clear();
-  }
-
   sql::Connection& db() { return db_; }
+  int error() { return error_; }
 
  private:
   base::ScopedTempDir temp_dir_;
   sql::Connection db_;
 
   // The error code of the most recent error.
   int error_;
   // Original statement which has caused the error.
   std::string sql_text_;
 };
@@ skipping 75 matching lines @@
 // delete support.
 TEST_F(SQLiteFeaturesTest, ForeignKeySupport) {
   ASSERT_TRUE(db().Execute("PRAGMA foreign_keys=1"));
   ASSERT_TRUE(db().Execute("CREATE TABLE parents (id INTEGER PRIMARY KEY)"));
   ASSERT_TRUE(db().Execute(
       "CREATE TABLE children ("
       "    id INTEGER PRIMARY KEY,"
       "    pid INTEGER NOT NULL REFERENCES parents(id) ON DELETE CASCADE)"));
 
   // Inserting without a matching parent should fail with constraint violation.
-  EXPECT_FALSE(db().Execute("INSERT INTO children VALUES (10, 1)"));
-  VerifyAndClearLastError(SQLITE_CONSTRAINT);
+  // Mask off any extended error codes for USE_SYSTEM_SQLITE.
+  int insertErr = db().ExecuteAndReturnErrorCode(
+      "INSERT INTO children VALUES (10, 1)");
+  EXPECT_EQ(SQLITE_CONSTRAINT, (insertErr&0xff));
 
   size_t rows;
   EXPECT_TRUE(sql::test::CountTableRows(&db(), "children", &rows));
   EXPECT_EQ(0u, rows);
 
   // Inserting with a matching parent should work.
   ASSERT_TRUE(db().Execute("INSERT INTO parents VALUES (1)"));
   EXPECT_TRUE(db().Execute("INSERT INTO children VALUES (11, 1)"));
   EXPECT_TRUE(db().Execute("INSERT INTO children VALUES (12, 1)"));
   EXPECT_TRUE(sql::test::CountTableRows(&db(), "children", &rows));
   EXPECT_EQ(2u, rows);
 
   // Deleting the parent should cascade, i.e., delete the children as well.
   ASSERT_TRUE(db().Execute("DELETE FROM parents"));
   EXPECT_TRUE(sql::test::CountTableRows(&db(), "children", &rows));
   EXPECT_EQ(0u, rows);
 }
 
 }  // namespace