[sqlite] sql::Recovery working under USE_SYSTEM_SQLITE.

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 "sql/recovery.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 154 matching lines @@
   }
   EXPECT_FALSE(db().is_open());
   ASSERT_TRUE(Reopen());
   EXPECT_TRUE(db().is_open());
   ASSERT_EQ("CREATE TABLE x (t TEXT)", GetSchema(&db()));
 
   ASSERT_EQ("This is a test",
             ExecuteWithResults(&db(), kXSql, "|", "\n"));
 }
 
-// The recovery virtual table is only supported for Chromium's SQLite.
-#if !defined(USE_SYSTEM_SQLITE)
-
 // Test operation of the virtual table used by sql::Recovery.
 TEST_F(SQLRecoveryTest, VirtualTable) {
   const char kCreateSql[] = "CREATE TABLE x (t TEXT)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   ASSERT_TRUE(db().Execute("INSERT INTO x VALUES ('This is a test')"));
   ASSERT_TRUE(db().Execute("INSERT INTO x VALUES ('That was a test')"));
 
   // Successfully recover the database.
   {
     scoped_ptr<sql::Recovery> recovery = sql::Recovery::Begin(&db(), db_path());
@@ skipping 519 matching lines @@
   ASSERT_TRUE(Reopen());
   ASSERT_EQ(expected_schema, GetSchema(&db()));
   ASSERT_EQ(expected_data, ExecuteWithResults(&db(), kXSql, "|", "\n"));
 }
 
 // Recover a golden file where an interior page has been manually modified so
 // that the number of cells is greater than will fit on a single page.  This
 // case happened in <http://crbug.com/387868>.
 TEST_F(SQLRecoveryTest, Bug387868) {
   base::FilePath golden_path;
   ASSERT_TRUE(PathService::Get(sql::test::DIR_TEST_DATA, &golden_path));

[Scott Hess - ex-Googler, 2016/03/02 01:00:32]

This is failing on iOS.  I'm guessing something about my incantations in
sql/test/sql_test_suite.h is wrong?

This test _could_ be disabled for iOS, because what it's testing is
cross-platform.

[Scott Hess - ex-Googler, 2016/03/07 21:50:13]

OK, I think this needs to be disabled.  DIR_SOURCE_ROOT comes through as
something like:
/private/tmp/tmp<X>/Library/Developer/CoreSimulator/Devices/<GUID>/data/Containers/Bundle/Application/<GUID>/sql_unittests.app/
which is entirely different from what I see on OSX (src/ dir).  So I'm guessing
this kind of thing only works if someone does additional work to include part of
the root as a resource or something, so I'm going to comment this one out for
iOS.

[Scott Hess - ex-Googler, 2016/03/07 23:11:15]

OK, figured it out by poking around with base_unittests a bit.  Last patch fixes
it right, without disabling the test.

   golden_path = golden_path.AppendASCII("recovery_387868");
   db().Close();
   ASSERT_TRUE(base::CopyFile(golden_path, db_path()));
   ASSERT_TRUE(Reopen());
 
   {
     scoped_ptr<sql::Recovery> recovery = sql::Recovery::Begin(&db(), db_path());
     ASSERT_TRUE(recovery.get());
 
     // Create the new version of the table.
     const char kCreateSql[] =
         "CREATE TABLE x (id INTEGER PRIMARY KEY, t0 TEXT)";
     ASSERT_TRUE(recovery->db()->Execute(kCreateSql));
 
     size_t rows = 0;
     EXPECT_TRUE(recovery->AutoRecoverTable("x", &rows));
     EXPECT_EQ(43u, rows);
 
     // Successfully recovered.
     EXPECT_TRUE(sql::Recovery::Recovered(std::move(recovery)));
   }
 }
-#endif  // !defined(USE_SYSTEM_SQLITE)
 
 // Memory-mapped I/O interacts poorly with I/O errors.  Make sure the recovery
 // database doesn't accidentally enable it.
 TEST_F(SQLRecoveryTest, NoMmap) {
   scoped_ptr<sql::Recovery> recovery = sql::Recovery::Begin(&db(), db_path());
   ASSERT_TRUE(recovery.get());
 
   // In the current implementation, the PRAGMA successfully runs with no result
   // rows.  Running with a single result of |0| is also acceptable.
   sql::Statement s(recovery->db()->GetUniqueStatement("PRAGMA mmap_size"));
   EXPECT_TRUE(!s.Step() || !s.ColumnInt64(0));
 }
 
 }  // namespace