Import SQLite 3.8.7.4.

sql/recovery_unittest.cc

 // Copyright 2013 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_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 310 matching lines @@
 
   // TODO(shess): Figure out a query which causes SQLite to notice
   // this organically.  Meanwhile, just handle it manually.
 
   ASSERT_TRUE(Reopen());
 
   // Index shows one less than originally inserted.
   const char kCountSql[] = "SELECT COUNT (*) FROM x";
   EXPECT_EQ("9", ExecuteWithResults(&db(), kCountSql, "|", ","));
 
-  // A full table scan shows all of the original data.
-  const char kDistinctSql[] = "SELECT DISTINCT COUNT (id) FROM x";
+  // A full table scan shows all of the original data.  Using column [v] to
+  // force use of the table rather than the index.
+  const char kDistinctSql[] = "SELECT DISTINCT COUNT (v) FROM x";
   EXPECT_EQ("10", ExecuteWithResults(&db(), kDistinctSql, "|", ","));
 
   // Insert id 0 again.  Since it is not in the index, the insert
   // succeeds, but results in a duplicate value in the table.
   const char kInsertSql[] = "INSERT INTO x (id, v) VALUES (0, 100)";
   ASSERT_TRUE(db().Execute(kInsertSql));
 
   // Duplication is visible.
   EXPECT_EQ("10", ExecuteWithResults(&db(), kCountSql, "|", ","));
   EXPECT_EQ("11", ExecuteWithResults(&db(), kDistinctSql, "|", ","));
@@ skipping 366 matching lines @@
     EXPECT_TRUE(recovery->AutoRecoverTable("x", 0, &rows));
     EXPECT_EQ(43u, rows);
 
     // Successfully recovered.
     EXPECT_TRUE(sql::Recovery::Recovered(recovery.Pass()));
   }
 }
 #endif  // !defined(USE_SYSTEM_SQLITE)
 
 }  // namespace