Upstream sqlite gyp changes for Android.

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/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "sql/meta_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
   EXPECT_TRUE(db().BeginTransaction());
 }
 
 // Test that sql::Connection::Raze() results in a database without the
 // tables from the original database.
 TEST_F(SQLConnectionTest, Raze) {
   const char* kCreateSql = "CREATE TABLE foo (id INTEGER PRIMARY KEY, value)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   ASSERT_TRUE(db().Execute("INSERT INTO foo (value) VALUES (12)"));
 
+  int pragma_auto_vacuum = 0;
+  {
+    sql::Statement s(db().GetUniqueStatement("PRAGMA auto_vacuum"));
+    ASSERT_TRUE(s.Step());
+    pragma_auto_vacuum = s.ColumnInt(0);
+  }

[Scott Hess - ex-Googler, 2012/08/05 15:34:46]

2 is a valid auto_vacuum result.  I don't know how things are setup in that
case, but if the following tests succeed, it would be coincidental.  I think it
would be reasonable to have an ASSERT_TRUE(auto_vacuum == 0 || auto_vacuum == 1)
here.  ASSERT_TRUE because if it's false, then the assumptions in the test are
not valid.

[Yaron, 2012/08/06 17:23:43]

Done.

+
+  // If auto_vacuum is set, there's an extra page to maintain a freelist.
+  const int kExpectedPageCount = 2 + pragma_auto_vacuum;
+
   {
     sql::Statement s(db().GetUniqueStatement("PRAGMA page_count"));
     ASSERT_TRUE(s.Step());
-    EXPECT_EQ(2, s.ColumnInt(0));
+    EXPECT_EQ(kExpectedPageCount, s.ColumnInt(0));
   }
 
   {
     sql::Statement s(db().GetUniqueStatement("SELECT * FROM sqlite_master"));
     ASSERT_TRUE(s.Step());
     EXPECT_EQ("table", s.ColumnString(0));
     EXPECT_EQ("foo", s.ColumnString(1));
     EXPECT_EQ("foo", s.ColumnString(2));
-    EXPECT_EQ(2, s.ColumnInt(3));
+    // Table "foo" is stored in the last page of the file.
+    EXPECT_EQ(kExpectedPageCount, s.ColumnInt(3));
     EXPECT_EQ(kCreateSql, s.ColumnString(4));
   }
 
   ASSERT_TRUE(db().Raze());
 
   {
     sql::Statement s(db().GetUniqueStatement("PRAGMA page_count"));
     ASSERT_TRUE(s.Step());
     EXPECT_EQ(1, s.ColumnInt(0));
   }
 
   {
     sql::Statement s(db().GetUniqueStatement("SELECT * FROM sqlite_master"));
     ASSERT_FALSE(s.Step());
   }
+
+  {
+    sql::Statement s(db().GetUniqueStatement("PRAGMA auto_vacuum"));
+    ASSERT_TRUE(s.Step());
+    // auto_vacuum must be preserved across a Raze.
+    EXPECT_EQ(pragma_auto_vacuum, s.ColumnInt(0));
+  }
 }
 
 // Test that Raze() maintains page_size.
 TEST_F(SQLConnectionTest, RazePageSize) {
   // Fetch the default page size and double it for use in this test.
   // Scoped to release statement before Close().
   int default_page_size = 0;
   {
     sql::Statement s(db().GetUniqueStatement("PRAGMA page_size"));
     ASSERT_TRUE(s.Step());
@@ skipping 86 matching lines @@
   // Otherwise, sqlite3 doesn't find the correct directory to store
   // temporary files and will report the error 'unable to open
   // database file'.
   ASSERT_TRUE(meta_table.Init(&db(), 4, 4));
 }
 #endif
 
 // TODO(shess): Spin up a background thread to hold other_db, to more
 // closely match real life.  That would also allow testing
 // RazeWithTimeout().