# 
# patch "ChangeLog"
#  from [d87b6621bea183540333477652b1ee695004ea1d]
#    to [db6f8c9ca9059b8a1584f3d3a6aa4f1065c51673]
# 
# patch "schema_migration.cc"
#  from [f3ff31fcbb6673a7a7847cd669e33eee20d32eae]
#    to [454fd869cecba6ce84ee4da05463441a2500f02b]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-09  Nathaniel Smith  <address@hidden>
 
+	* schema_migration.cc (calculate_schema_id): Include indexes in
+	the schema id.
+
+2005-07-09  Nathaniel Smith  <address@hidden>
+
 	* ChangeLog, configure.ac: Revert accidentally-committed changes.
 
 2005-07-09  Nathaniel Smith  <address@hidden>
--- schema_migration.cc
+++ schema_migration.cc
@@ -157,7 +157,11 @@
   string tmp, tmp2;
   int res = sqlite3_exec_printf(sql, 
                                "SELECT sql FROM sqlite_master "
-                               "WHERE type = 'table' "
+                               "WHERE type = 'table' OR type = 'index' "
+                                // filter out NULL sql statements, because
+                                // those are auto-generated indices (for
+                                // UNIQUE constraints, etc.).
+                               "AND sql IS NOT NULL "
                                "ORDER BY name", 
                                &append_sql_stmt, &tmp, NULL);
   if (res != SQLITE_OK)