From 48d651118664d84613633fd843ea164249d81b25 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Wed, 23 May 2012 15:26:33 +0200
Subject: [PATCH] Fixes in developer install instructions and scripts

Per Josh Kupershmidt
---
 docs/dev_install.rst          |  3 ++-
 pgweb/core/fixtures/data.yaml | 12 +++++++++++-
 sql/compat_tables.sql         | 20 ++++++++++++++++++++
 sql/varnish.sql               |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 sql/compat_tables.sql

diff --git a/docs/dev_install.rst b/docs/dev_install.rst
index c45582c9..8952fc99 100644
--- a/docs/dev_install.rst
+++ b/docs/dev_install.rst
@@ -5,7 +5,7 @@ So, you're ready to contribute to pgweb, and you want to set up a
 local working copy of the website code, so you have something to work
 with. Here's a quick step-by-step on how to do that:
 
-1. Make sure you have downloaded and installed django *version 1.2*
+#. Make sure you have downloaded and installed django *version 1.2*
    (or later). You will also need the dependencies *psycopg2*, *yaml*
    and *markdown* (these are python libraries, so prefix python- for Debian
    packages, for example).
@@ -28,6 +28,7 @@ with. Here's a quick step-by-step on how to do that:
 	NO_HTTPS_REDIRECT=True
 	SESSION_COOKIE_SECURE=False
 	SESSION_COOKIE_DOMAIN=None
+        DATABASE_NAME="pgweb"
 #. In the pgweb directory run the following command to create all
    tables and indexes, as well as create a superuser for your local
    installation::
diff --git a/pgweb/core/fixtures/data.yaml b/pgweb/core/fixtures/data.yaml
index bc8dc5be..36662f05 100644
--- a/pgweb/core/fixtures/data.yaml
+++ b/pgweb/core/fixtures/data.yaml
@@ -6,6 +6,8 @@
    "relnotes": "release-8-4.html", 
    "tree": "8.4", 
    "reldate": "2009-07-01", 
+   "eoldate": "2014-07-01",
+   "firstreldate": "2009-07-01", 
    "latestminor": 0
   }
  }, 
@@ -16,6 +18,8 @@
    "relnotes": "release-8-3-7.html", 
    "tree": "8.3", 
    "reldate": "2009-03-17", 
+   "eoldate": "2013-02-01",
+   "firstreldate": "2009-03-17", 
    "latestminor": 7
   }
  }, 
@@ -25,7 +29,9 @@
   "fields": {
    "relnotes": "release-8-2-13.html", 
    "tree": "8.2", 
-   "reldate": "2009-03-17", 
+   "reldate": "2009-03-17",
+   "eoldate": "2011-12-01", 
+   "firstreldate": "2009-03-17", 
    "latestminor": 13
   }
  }, 
@@ -36,6 +42,8 @@
    "relnotes": "release.html#RELEASE-8-1-17", 
    "tree": "8.1", 
    "reldate": "2009-03-17", 
+   "eoldate" : "2010-11-01",
+   "firstreldate": "2009-03-17", 
    "latestminor": 17
   }
  }, 
@@ -46,6 +54,8 @@
    "relnotes": "release.html#RELEASE-8-0-21", 
    "tree": "8.0", 
    "reldate": "2009-03-17", 
+   "eoldate": "2010-10-01",
+   "firstreldate": "2009-03-17", 
    "latestminor": 21
   }
  }, 
diff --git a/sql/compat_tables.sql b/sql/compat_tables.sql
new file mode 100644
index 00000000..bb121a46
--- /dev/null
+++ b/sql/compat_tables.sql
@@ -0,0 +1,20 @@
+--
+-- tables created for compatibility with migration from old system.
+-- Once we drop migration support they can be removed, but for now
+-- dummies are required for functions to work.
+--
+CREATE TABLE users_old (
+    userid character varying(16),
+    fullname character varying(128),
+    authorblurb text,
+    email character varying(128),
+    communitydoc_superuser integer,
+    created timestamp with time zone,
+    lastlogin timestamp with time zone,
+    matrixeditor integer,
+    pwdhash text,
+    resethash text,
+    resethashtime timestamp with time zone,
+    sshkey text,
+    sshkey_last_update timestamp with time zone
+);
diff --git a/sql/varnish.sql b/sql/varnish.sql
index 3de9196c..1b5f8d75 100644
--- a/sql/varnish.sql
+++ b/sql/varnish.sql
@@ -2,7 +2,7 @@ BEGIN;
 
 --
 -- Create a function to purge from varnish cache
--- By defalut this adds the object to a pgq queue,
+-- By default this adds the object to a pgq queue,
 -- but this function can be replaced with a void one
 -- when running a development version.
 --
-- 
2.39.5