# 
# 
# patch "ChangeLog"
#  from [d4b922694eb36f78d3531d1c139fdb38ee65080c]
#    to [dad1aa7c584a0803e2803a8416567671a1a31150]
# 
# patch "Makefile.am"
#  from [f8f60ee0c94da567d51a59fdadabf61979f3ea27]
#    to [478a31e94ce4d2b98f0d84d5001bac6eb275fc9b]
# 
# patch "database.cc"
#  from [2722674ada7b591827618ca848ea6f76d4326c19]
#    to [247b644f58258431b477aa9a0c74fd5f368587d5]
# 
# patch "database.hh"
#  from [ddacb8fb41b8bd1b5e0b18bb318c5190a9348f7f]
#    to [9d05e3ad4de7a7407b1c755028135b91d61cef73]
# 
============================================================
--- ChangeLog	d4b922694eb36f78d3531d1c139fdb38ee65080c
+++ ChangeLog	dad1aa7c584a0803e2803a8416567671a1a31150
@@ -1,5 +1,10 @@
 2006-06-19  Nathaniel Smith  <address@hidden>
 
+	* Makefile.am (EXTRA_DIST, BUILT_SOURCES_CLEAN): 
+	* database.hh, database.cc: Remove old dead views stuff.
+
+2006-06-19  Nathaniel Smith  <address@hidden>
+
 	* cmd_automate.cc: #include <boost/function.hpp>, as requested in
 	bug #16866 for boost 1.32.0 compatibility.
 
============================================================
--- Makefile.am	f8f60ee0c94da567d51a59fdadabf61979f3ea27
+++ Makefile.am	478a31e94ce4d2b98f0d84d5001bac6eb275fc9b
@@ -394,7 +394,7 @@
              monotone.spec \
              monotone.html \
              texinfo.css \
-	     schema.sql views.sql \
+	     schema.sql \
 	     std_hooks.lua test_hooks.lua tester.lua \
 	     testsuite.lua $(srcdir)/tests/ \
 	     tester-testsuite.lua $(srcdir)/tester-tests/ \
@@ -494,7 +494,7 @@
 # we generate some headers to copy data into the executable
 
 BUILT_SOURCES_CLEAN = std_hooks.h test_hooks.h tester.h \
-                      schema.h views.h \
+                      schema.h \
                       package_revision.c \
                       package_full_revision.txt package_full_revision_raw.txt package_full_revision.c \
                       $(PCH_FILE) $(PCH_BUILD)
============================================================
--- database.cc	2722674ada7b591827618ca848ea6f76d4326c19
+++ database.cc	247b644f58258431b477aa9a0c74fd5f368587d5
@@ -46,8 +46,6 @@
 // defined in schema.sql, converted to header:
 #include "schema.h"
 
-// defined in views.sql, converted to header:
-#include "views.h"
 // this file defines a public, typed interface to the database.
 // the database class encapsulates all knowledge about sqlite,
 // the schema, and all SQL statements used to access the schema.
@@ -312,7 +310,6 @@
 
       check_schema();
       install_functions(__app);
-      install_views();
 
       if (!migrating_format)
         check_format();
@@ -2024,28 +2021,6 @@
 }
 
 void
-database::install_views()
-{
-  // we don't currently use any views. re-enable this code if you find a
-  // compelling reason to use views.
-
-  /*
-  // delete any existing views
-  results res;
-  fetch(res, one_col, any_rows,
-        "SELECT name FROM sqlite_master WHERE type='view'");
-
-  for (size_t i = 0; i < res.size(); ++i)
-    {
-      string drop = "DROP VIEW " + res[i][0];
-      execute(drop.c_str());
-    }
-  // register any views we're going to use
-  execute(views_constant);
-  */
-}
-
-void
 database::get_certs(vector<cert> & certs,
                     string const & table)
 {
============================================================
--- database.hh	ddacb8fb41b8bd1b5e0b18bb318c5190a9348f7f
+++ database.hh	9d05e3ad4de7a7407b1c755028135b91d61cef73
@@ -103,7 +103,6 @@
   bool transaction_exclusive;
 
   void install_functions(app_state * app);
-  void install_views();
 
   typedef std::vector< std::vector<std::string> > results;