# 
# patch "ChangeLog"
#  from [d2a2c2588e2b5712692718a3c7fab8a151ea03c3]
#    to [3e5ee0a748faa548a5c1960c74a1c1df3bcadd5e]
# 
# patch "database.cc"
#  from [d2b9a3f2fb7aae0006bd60e1266f0d9e7f882bfd]
#    to [e9d9e9705f90c63727646989a770d9d35101c1cd]
# 
========================================================================
--- ChangeLog	d2a2c2588e2b5712692718a3c7fab8a151ea03c3
+++ ChangeLog	3e5ee0a748faa548a5c1960c74a1c1df3bcadd5e
@@ -1,5 +1,8 @@
 2005-12-01  Matthew Gregan  <address@hidden>
 
+	* database.cc (database::version, database::migrate): Improve
+	error handling where user has supplied the path to a non-existant
+	database file.  Submitted by Neil Conway.
 	* win32/fs.cc (rename_clobberingly_impl): Improve error handling
 	around LoadLibrary call.
 	* lua/{lvm.c,lgc.c,lapi.c}: Lua post-5.0.2 bugfixes from
========================================================================
--- database.cc	d2b9a3f2fb7aae0006bd60e1266f0d9e7f882bfd
+++ database.cc	e9d9e9705f90c63727646989a770d9d35101c1cd
@@ -461,33 +461,23 @@
 #undef SPACE_USAGE
 }
 
-void 
+void
 database::version(ostream & out)
 {
   string id;
 
-  check_filename();
-  open();
+  calculate_schema_id(sql(), id);
 
-  calculate_schema_id(__sql, id);
-
-  close();
-
   out << F("database schema version: %s") % id << endl;
 }
 
-void 
+void
 database::migrate()
-{  
-  check_filename();
-
-  open();
-
-  migrate_monotone_schema(__sql, __app);
-  close();
+{
+  migrate_monotone_schema(sql(), __app);
 }
 
-void 
+void
 database::rehash()
 {
   transaction_guard guard(*this);