# 
# 
# patch "ChangeLog"
#  from [b3ba228fd4589ed2d8cd047c3b8cf71742b857a7]
#    to [261744ccd65bd189628ec9d9a8cf37d6f4cb0de5]
# 
# patch "database.cc"
#  from [61fe3c82f418f10c32775d8df04e3d73e7e97cde]
#    to [45ead6baa3495458f741b43b2db8c37bc09f2c4e]
# 
# patch "database.hh"
#  from [0fa8c0eed942fab0712c456303cdd2195796730f]
#    to [81c7eeb032d7b54ffa52b8fb1893c388554557a0]
# 
============================================================
--- ChangeLog	b3ba228fd4589ed2d8cd047c3b8cf71742b857a7
+++ ChangeLog	261744ccd65bd189628ec9d9a8cf37d6f4cb0de5
@@ -1,5 +1,10 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* database.cc (set_filename): Simplify slightly.
+	(delta_exists): Remove unused 3-argument version.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (reindex): Remove.
 	* database.cc (database::rehash): Likewise.
 
============================================================
--- database.cc	61fe3c82f418f10c32775d8df04e3d73e7e97cde
+++ database.cc	45ead6baa3495458f741b43b2db8c37bc09f2c4e
@@ -644,10 +644,7 @@
 void 
 database::set_filename(system_path const & file)
 {
-  if (__sql)
-    {
-      throw oops((F("cannot change filename to %s while db is open") % file).str());
-    }
+  I(!__sql);
   filename = file;
 }
 
@@ -708,19 +705,6 @@
   return res.size() > 0;
 }
 
-bool 
-database::delta_exists(hexenc<id> const & ident,
-                       hexenc<id> const & base,
-                       string const & table)
-{
-  results res;
-  string query = "SELECT id FROM " + table + " WHERE id = ? AND base = ?";
-  fetch(res, one_col, any_rows, query.c_str(), 
-        ident().c_str(), base().c_str());
-  I((res.size() == 1) || (res.size() == 0));
-  return res.size() == 1;
-}
-
 unsigned long
 database::count(string const & table)
 {
============================================================
--- database.hh	0fa8c0eed942fab0712c456303cdd2195796730f
+++ database.hh	81c7eeb032d7b54ffa52b8fb1893c388554557a0
@@ -113,9 +113,6 @@
               std::string const & table);
   bool delta_exists(hexenc<id> const & ident,
                     std::string const & table);
-  bool delta_exists(hexenc<id> const & ident,
-                    hexenc<id> const & base,
-                    std::string const & table);
 
   unsigned long count(std::string const & table);
   unsigned long space_usage(std::string const & table,