Import SQLite 3.8.7.4.

sql/connection_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 "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "sql/connection.h"
@@ skipping 219 matching lines @@
 TEST_F(SQLConnectionTest, ErrorCallback) {
   const char* kCreateSql = "CREATE TABLE foo (id INTEGER UNIQUE)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   ASSERT_TRUE(db().Execute("INSERT INTO foo (id) VALUES (12)"));
 
   int error = SQLITE_OK;
   {
     sql::ScopedErrorCallback sec(
         &db(), base::Bind(&sql::CaptureErrorCallback, &error));
     EXPECT_FALSE(db().Execute("INSERT INTO foo (id) VALUES (12)"));
-    EXPECT_EQ(SQLITE_CONSTRAINT, error);
+
+    // Later versions of SQLite throw SQLITE_CONSTRAINT_UNIQUE.  The specific
+    // sub-error isn't really important.
+    EXPECT_EQ(SQLITE_CONSTRAINT, (error&0xff));
   }
 
   // Callback is no longer in force due to reset.
   {
     error = SQLITE_OK;
     sql::ScopedErrorIgnorer ignore_errors;
     ignore_errors.IgnoreError(SQLITE_CONSTRAINT);
     ASSERT_FALSE(db().Execute("INSERT INTO foo (id) VALUES (12)"));
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
     EXPECT_EQ(SQLITE_OK, error);
@@ skipping 190 matching lines @@
 
   {
     base::ScopedFILE file(base::OpenFile(db_path(), "wb"));
     ASSERT_TRUE(file.get() != NULL);
 
     const char* kJunk = "This is the hour of our discontent.";
     fputs(kJunk, file.get());
   }
   ASSERT_TRUE(base::PathExists(db_path()));
 
-  // SQLite will successfully open the handle, but will fail with
-  // SQLITE_IOERR_SHORT_READ on pragma statemenets which read the
-  // header.
+  // SQLite will successfully open the handle, but fail when running PRAGMA
+  // statements that access the database.
   {
     sql::ScopedErrorIgnorer ignore_errors;
-    ignore_errors.IgnoreError(SQLITE_IOERR_SHORT_READ);
+
+    // Earlier versions of Chromium compiled against SQLite 3.6.7.3, which
+    // returned SQLITE_IOERR_SHORT_READ in this case.  Some platforms may still
+    // compile against an earlier SQLite via USE_SYSTEM_SQLITE.
+    if (ignore_errors.SQLiteLibVersionNumber() < 3008007) {
+      ignore_errors.IgnoreError(SQLITE_IOERR_SHORT_READ);
+    } else {
+      ignore_errors.IgnoreError(SQLITE_NOTADB);
+    }
+
     EXPECT_TRUE(db().Open(db_path()));
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
   EXPECT_TRUE(db().Raze());
   db().Close();
 
   // Now empty, the open should open an empty database.
   EXPECT_TRUE(db().Open(db_path()));
   EXPECT_EQ(0, SqliteMasterCount(&db()));
 }
@@ skipping 392 matching lines @@
     EXPECT_LT(1u, messages.size());
     EXPECT_NE(kOk, messages[0]);
     ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
   }
 
   // TODO(shess): CorruptTableOrIndex could be used to produce a
   // file that would pass the quick check and fail the full check.
 }
 
 }  // namespace