Merge lp:~thomir-deactivatedaccount/sloecode/dbconfig-common-sucks into lp:sloecode

[Thomi Richards]

Replace dbconfig-common with our own built-in solution.

=== modified file 'dbpatches/README.txt'
--- dbpatches/README.txt	2012-03-31 23:56:39 +0000
+++ dbpatches/README.txt	2012-04-22 06:37:19 +0000
@@ -4,20 +4,14 @@
 
 Scripts in this folder are broken into two categories:
 
- * Schema definition scripts are used to create the initial database at install
-   time. These scripts must be kept up-to-date. If a schema change is
-   introduced, you must make sure that the schema files match the current
-   database schema. These scripts are named after the database type, and are
-   stored in the schema directory.
-
-   Note that the schema file may in fact be applied to an existing database. It
-   must not alter any existing data. So for example, create table statements
-   must be 'CREATE TABLE IF NOT EXISTS'.
+ * Schema definition scripts are used to create the initial database and MUST
+   NOT BE CHANGED, unless you really know what you are doing, and are also 
+   going to change the debian packaging scripts. These scripts are named after
+   the database type, and are stored in the schema directory.
 
  * Schema patches change the original schema definition over time. They are
    stored in the patches directory, and are then further separated into 
-   separate folders for database type. Patch scripts are numbered according to
-   the version of the package they will be installed in. If you are creating
-   the first patch of a new release, you will need to create a new patch file,
-   otherwise append your patch to an existing file.
+   separate folders for database type. Patch scripts are numbered, and must be
+   numbered consecutively. For this reason, if you need to make a change to the
+   database schema, you MUST get a patch number from the code sloecode developers.
 

=== removed file 'dbpatches/patches/mysql/1.1'
--- dbpatches/patches/mysql/1.1	2012-03-31 23:56:39 +0000
+++ dbpatches/patches/mysql/1.1	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
-This patch alters the projects table so the displayname column no longer
-has a unique constraint.
-*/
-
-ALTER TABLE project DROP INDEX displayname;
-
-/*
-Alter the project table to reduce the size of the name and displayname columns
-to sensible lengths.
-*/
-
-ALTER TABLE project
-    MODIFY COLUMN `name` varchar(24) DEFAULT NULL,
-    MODIFY COLUMN `displayname` varchar(32) DEFAULT NULL;
-
-/*
-Similar treatment for the user table:
-*/
-
-ALTER TABLE person
-    MODIFY COLUMN `login` varchar(24) DEFAULT NULL,
-    MODIFY COLUMN `name` varchar(32) DEFAULT NULL;
-
-/*
-This patch add the public column to the projects table, defaulting all projects to private.
-*/
-
--- add public column:
-ALTER TABLE project ADD public BOOLEAN CHECK (public IN (0, 1));
-
-- default to private:
-UPDATE project SET public=0;

=== added file 'dbpatches/patches/mysql/2'
--- dbpatches/patches/mysql/2	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/mysql/2	2012-04-22 06:37:19 +0000
@@ -0,0 +1,6 @@
+/*
+This patch alters the projects table so the displayname column no longer
+has a unique constraint.
+*/
+
+ALTER TABLE project DROP INDEX displayname;
\ No newline at end of file

=== added file 'dbpatches/patches/mysql/3'
--- dbpatches/patches/mysql/3	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/mysql/3	2012-04-22 06:37:19 +0000
@@ -0,0 +1,16 @@
+/*
+Alter the project table to reduce the size of the name and displayname columns
+to sensible lengths.
+*/
+
+ALTER TABLE project
+    MODIFY COLUMN `name` varchar(24) DEFAULT NULL,
+    MODIFY COLUMN `displayname` varchar(32) DEFAULT NULL;
+
+/*
+Similar treatment for the user table:
+*/
+
+ALTER TABLE person
+    MODIFY COLUMN `login` varchar(24) DEFAULT NULL,
+    MODIFY COLUMN `name` varchar(32) DEFAULT NULL;
\ No newline at end of file

=== added file 'dbpatches/patches/mysql/4'
--- dbpatches/patches/mysql/4	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/mysql/4	2012-04-22 06:37:19 +0000
@@ -0,0 +1,9 @@
+/*
+This patch add the public column to the projects table, defaulting all projects to private.
+*/
+
+-- add public column:
+ALTER TABLE project ADD public BOOLEAN CHECK (public IN (0, 1));
+
+- default to private:
+UPDATE project SET public=0;

=== renamed directory 'dbpatches/patches/sqlite3' => 'dbpatches/patches/sqlite'
=== added file 'dbpatches/patches/sqlite/2'
--- dbpatches/patches/sqlite/2	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/sqlite/2	2012-04-22 06:37:19 +0000
@@ -0,0 +1,27 @@
+/*
+This patch alters the projects table so the displayname column no longer
+has a unique constraint. Unfortunately, SQLite does not allow you to remove
+column constraint with the ALTER TABLE command, so we need to rename the table,
+create the new table without the UNIQUE constraint on the displayname column,
+insert all the data from the renamed table, and finally delete the old, renamed
+table.
+*/
+
+-- rename old table:
+ALTER TABLE project RENAME TO project_old;
+
+-- create new table:
+CREATE TABLE project (
+	id INTEGER NOT NULL,
+	name VARCHAR(200),
+	displayname VARCHAR(200),
+	description TEXT,
+	PRIMARY KEY (id),
+	UNIQUE (name)
+);
+
+-- insert data:
+INSERT INTO project SELECT * FROM project_old;
+
+-- remove old table:
+DROP TABLE project_old;
\ No newline at end of file

=== added file 'dbpatches/patches/sqlite/3'
--- dbpatches/patches/sqlite/3	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/sqlite/3	2012-04-22 06:37:19 +0000
@@ -0,0 +1,50 @@
+/*
+This patch alters the length of the name and displayname columns in the projects
+table to more sensible values. Unfortunately the SQLAlchemy ALTER TABLE command
+is pretty crap, and doesn't allow you to alter any existing table columns, so we
+need to rename the table, create the new table, and then copy all the data across.
+*/
+
+-- rename old table:
+ALTER TABLE project RENAME TO project_old;
+
+-- create new table:
+CREATE TABLE project (
+	id INTEGER NOT NULL,
+	name VARCHAR(24),
+	displayname VARCHAR(32),
+	description TEXT,
+	PRIMARY KEY (id),
+	UNIQUE (name)
+);
+
+-- insert data:
+INSERT INTO project SELECT * FROM project_old;
+
+-- remove old table:
+DROP TABLE project_old;
+
+/*
+Similar treatment for the user table:
+*/
+
+-- rename old table:
+ALTER TABLE person RENAME TO person_old;
+
+-- create new table:
+CREATE TABLE person (
+	id INTEGER NOT NULL,
+	login VARCHAR(24),
+	password VARCHAR(200),
+	name VARCHAR(32),
+	email VARCHAR(200),
+	PRIMARY KEY (id),
+	UNIQUE (login)
+);
+
+
+-- insert data:
+INSERT INTO person SELECT * FROM person_old;
+
+-- remove old table:
+DROP TABLE person_old;
\ No newline at end of file

=== added file 'dbpatches/patches/sqlite/4'
--- dbpatches/patches/sqlite/4	1970-01-01 00:00:00 +0000
+++ dbpatches/patches/sqlite/4	2012-04-22 06:37:19 +0000
@@ -0,0 +1,9 @@
+/*
+This patch add the public column to the projects table, defaulting all projects to private.
+*/
+
+-- add public column:
+ALTER TABLE project ADD public BOOLEAN CHECK (public IN (0, 1));
+
+-- default to private:
+UPDATE project SET public=0;

=== removed file 'dbpatches/patches/sqlite3/1.1'
--- dbpatches/patches/sqlite3/1.1	2012-03-31 23:56:39 +0000
+++ dbpatches/patches/sqlite3/1.1	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
-This patch alters the projects table so the displayname column no longer
-has a unique constraint. Unfortunately, SQLite does not allow you to remove
-column constraint with the ALTER TABLE command, so we need to rename the table,
-create the new table without the UNIQUE constraint on the displayname column,
-insert all the data from the renamed table, and finally delete the old, renamed
-table.
-*/
-
--- rename old table:
-ALTER TABLE project RENAME TO project_old;
-
--- create new table:
-CREATE TABLE project (
-	id INTEGER NOT NULL,
-	name VARCHAR(200),
-	displayname VARCHAR(200),
-	description TEXT,
-	PRIMARY KEY (id),
-	UNIQUE (name)
-);
-
--- insert data:
-INSERT INTO project SELECT * FROM project_old;
-
--- remove old table:
-DROP TABLE project_old;
-
-/*
-This patch alters the length of the name and displayname columns in the projects
-table to more sensible values. Unfortunately the SQLAlchemy ALTER TABLE command
-is pretty crap, and doesn't allow you to alter any existing table columns, so we
-need to rename the table, create the new table, and then copy all the data across.
-*/
-
--- rename old table:
-ALTER TABLE project RENAME TO project_old;
-
--- create new table:
-CREATE TABLE project (
-	id INTEGER NOT NULL,
-	name VARCHAR(24),
-	displayname VARCHAR(32),
-	description TEXT,
-	PRIMARY KEY (id),
-	UNIQUE (name)
-);
-
--- insert data:
-INSERT INTO project SELECT * FROM project_old;
-
--- remove old table:
-DROP TABLE project_old;
-
-/*
-Similar treatment for the user table:
-*/
-
--- rename old table:
-ALTER TABLE person RENAME TO person_old;
-
--- create new table:
-CREATE TABLE person (
-	id INTEGER NOT NULL,
-	login VARCHAR(24),
-	password VARCHAR(200),
-	name VARCHAR(32),
-	email VARCHAR(200),
-	PRIMARY KEY (id),
-	UNIQUE (login)
-);
-
-
--- insert data:
-INSERT INTO person SELECT * FROM person_old;
-
--- remove old table:
-DROP TABLE person_old;
-
-/*
-This patch add the public column to the projects table, defaulting all projects to private.
-*/
-
--- add public column:
-ALTER TABLE project ADD public BOOLEAN CHECK (public IN (0, 1));
-
--- default to private:
-UPDATE project SET public=0;

=== modified file 'dbpatches/schema/mysql'
--- dbpatches/schema/mysql	2012-03-31 23:56:39 +0000
+++ dbpatches/schema/mysql	2012-04-22 06:37:19 +0000
@@ -1,20 +1,79 @@
-
-CREATE TABLE IF NOT EXISTS `person` (
+-- MySQL dump 10.13  Distrib 5.1.54, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: sloecode
+-- ------------------------------------------------------
+-- Server version	5.1.54-1ubuntu4
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `database_version`
+--
+
+DROP TABLE IF EXISTS `database_version`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `database_version` (
+  `version` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`version`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `database_version`
+--
+
+LOCK TABLES `database_version` WRITE;
+/*!40000 ALTER TABLE `database_version` DISABLE KEYS */;
+INSERT INTO `database_version` VALUES (1);
+/*!40000 ALTER TABLE `database_version` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `person`
+--
+
+DROP TABLE IF EXISTS `person`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `person` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `login` varchar(24) DEFAULT NULL,
+  `login` varchar(200) DEFAULT NULL,
   `password` varchar(200) DEFAULT NULL,
-  `name` varchar(32) DEFAULT NULL,
+  `name` varchar(200) DEFAULT NULL,
   `email` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `login` (`login`)
-);
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `person`
+--
 
 LOCK TABLES `person` WRITE;
+/*!40000 ALTER TABLE `person` DISABLE KEYS */;
 INSERT INTO `person` VALUES (1,'admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918','Default Administrator',NULL);
+/*!40000 ALTER TABLE `person` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `person_keys`
+--
 
-CREATE TABLE IF NOT EXISTS `person_keys` (
+DROP TABLE IF EXISTS `person_keys`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `person_keys` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `person_id` int(11) DEFAULT NULL,
   `key_name` text,
@@ -22,41 +81,106 @@
   `key_data` text,
   `key_comment` text,
   PRIMARY KEY (`id`),
-  KEY `person_id` (`person_id`),
-  CONSTRAINT `person_keys_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `person` (`id`)
-);
-
-CREATE TABLE IF NOT EXISTS `person_project_membership` (
+  KEY `person_id` (`person_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `person_keys`
+--
+
+LOCK TABLES `person_keys` WRITE;
+/*!40000 ALTER TABLE `person_keys` DISABLE KEYS */;
+/*!40000 ALTER TABLE `person_keys` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `person_project_membership`
+--
+
+DROP TABLE IF EXISTS `person_project_membership`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `person_project_membership` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `person_id` int(11) DEFAULT NULL,
   `project_id` int(11) DEFAULT NULL,
   `role` enum('Observer','Developer','Manager') DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `person_id` (`person_id`),
   KEY `project_id` (`project_id`),
-  CONSTRAINT `person_project_membership_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `person` (`id`),
-  CONSTRAINT `person_project_membership_ibfk_2` FOREIGN KEY (`project_id`) REFERENCES `project` (`id`)
-);
-
-CREATE TABLE IF NOT EXISTS `project` (
+  KEY `person_id` (`person_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `person_project_membership`
+--
+
+LOCK TABLES `person_project_membership` WRITE;
+/*!40000 ALTER TABLE `person_project_membership` DISABLE KEYS */;
+/*!40000 ALTER TABLE `person_project_membership` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `project`
+--
+
+DROP TABLE IF EXISTS `project`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `project` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(24) DEFAULT NULL,
-  `public` tinyint(1) DEFAULT NULL,
-  `displayname` varchar(32) DEFAULT NULL,
+  `name` varchar(200) DEFAULT NULL,
+  `displayname` varchar(200) DEFAULT NULL,
   `description` text,
   PRIMARY KEY (`id`),
+  UNIQUE KEY `displayname` (`displayname`),
   UNIQUE KEY `name` (`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `site_role` (
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `project`
+--
+
+LOCK TABLES `project` WRITE;
+/*!40000 ALTER TABLE `project` DISABLE KEYS */;
+/*!40000 ALTER TABLE `project` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `site_role`
+--
+
+DROP TABLE IF EXISTS `site_role`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `site_role` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `person_id` int(11) DEFAULT NULL,
   `role` enum('User Admin','Project Admin') DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `person_id` (`person_id`),
-  CONSTRAINT `site_role_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `person` (`id`)
-);
+  KEY `person_id` (`person_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `site_role`
+--
 
 LOCK TABLES `site_role` WRITE;
-REPLACE INTO `site_role` VALUES (1,1,'User Admin'),(2,1,'Project Admin');
+/*!40000 ALTER TABLE `site_role` DISABLE KEYS */;
+INSERT INTO `site_role` VALUES (1,1,'User Admin'),(2,1,'Project Admin');
+/*!40000 ALTER TABLE `site_role` ENABLE KEYS */;
 UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2011-06-04 15:36:54

=== modified file 'dbpatches/schema/sqlite3'
--- dbpatches/schema/sqlite3	2012-03-31 23:56:39 +0000
+++ dbpatches/schema/sqlite3	2012-04-22 06:37:19 +0000
@@ -1,36 +1,50 @@
 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
-CREATE TABLE IF NOT EXISTS person (
-	id INTEGER NOT NULL, 
-	login VARCHAR(24), 
+CREATE TABLE project (
+	id INTEGER NOT NULL, 
+	name VARCHAR(200), 
+	displayname VARCHAR(200), 
+	description TEXT, 
+	PRIMARY KEY (id), 
+	UNIQUE (displayname), 
+	UNIQUE (name)
+);
+CREATE TABLE database_version (
+	version INTEGER NOT NULL, 
+	PRIMARY KEY (version)
+);
+INSERT INTO "database_version" VALUES(1);
+CREATE TABLE person (
+	id INTEGER NOT NULL, 
+	login VARCHAR(200), 
 	password VARCHAR(200), 
-	name VARCHAR(32), 
+	name VARCHAR(200), 
 	email VARCHAR(200), 
 	PRIMARY KEY (id), 
 	UNIQUE (login)
 );
-INSERT OR REPLACE INTO "person" VALUES(1,'admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918','Default Administrator',NULL);
-CREATE TABLE IF NOT EXISTS project (
-	id INTEGER NOT NULL, 
-	name VARCHAR(24), 
-	public BOOLEAN, 
-	displayname VARCHAR(32), 
-	description TEXT, 
-	PRIMARY KEY (id), 
-	UNIQUE (name), 
-	CHECK (public IN (0, 1))
-);
-CREATE TABLE IF NOT EXISTS person_project_membership (
+INSERT INTO "person" VALUES(1,'admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918','Default Administrator',NULL);
+CREATE TABLE person_project_membership (
 	id INTEGER NOT NULL, 
 	person_id INTEGER, 
 	project_id INTEGER, 
 	role VARCHAR(9), 
 	PRIMARY KEY (id), 
-	FOREIGN KEY(person_id) REFERENCES person (id), 
+	CHECK (role IN ('Observer', 'Developer', 'Manager')), 
 	FOREIGN KEY(project_id) REFERENCES project (id), 
-	CHECK (role IN ('Observer', 'Developer', 'Manager'))
-);
-CREATE TABLE IF NOT EXISTS person_keys (
+	FOREIGN KEY(person_id) REFERENCES person (id)
+);
+CREATE TABLE site_role (
+	id INTEGER NOT NULL, 
+	person_id INTEGER, 
+	role VARCHAR(13), 
+	PRIMARY KEY (id), 
+	CHECK (role IN ('User Admin', 'Project Admin')), 
+	FOREIGN KEY(person_id) REFERENCES person (id)
+);
+INSERT INTO "site_role" VALUES(1,1,'User Admin');
+INSERT INTO "site_role" VALUES(2,1,'Project Admin');
+CREATE TABLE person_keys (
 	id INTEGER NOT NULL, 
 	person_id INTEGER, 
 	key_name TEXT, 
@@ -40,14 +54,4 @@
 	PRIMARY KEY (id), 
 	FOREIGN KEY(person_id) REFERENCES person (id)
 );
-CREATE TABLE IF NOT EXISTS site_role (
-	id INTEGER NOT NULL, 
-	person_id INTEGER, 
-	role VARCHAR(13), 
-	PRIMARY KEY (id), 
-	FOREIGN KEY(person_id) REFERENCES person (id), 
-	CHECK (role IN ('User Admin', 'Project Admin'))
-);
-INSERT OR REPLACE INTO "site_role" VALUES(1,1,'User Admin');
-INSERT OR REPLACE INTO "site_role" VALUES(2,1,'Project Admin');
 COMMIT;

=== modified file 'development.ini'
--- development.ini	2012-01-05 20:28:38 +0000
+++ development.ini	2012-04-22 06:37:19 +0000
@@ -21,6 +21,8 @@
 # Change this to change the port the sloecode web interface runs on:
 http_server_port = 5000
 
+database_patch_dir = %(here)s/dbpatches/patches/
+
 [smartserver]
 access_log_name = /var/sloecode/logs/smartserver-access.log
 log_name = /var/sloecode/logs/smartserver.log

=== modified file 'sloecode/config/environment.py'
--- sloecode/config/environment.py	2011-10-01 13:59:34 +0000
+++ sloecode/config/environment.py	2012-04-22 06:37:19 +0000
@@ -13,7 +13,7 @@
 import sloecode.lib.helpers
 from sloecode.lib.filters import FILTERS
 from sloecode.config.routing import make_map
-from sloecode.model import init_model
+from sloecode.model import init_model, maybe_upgrade_database
 
 def load_environment(global_conf, app_conf):
     """Configure the Pylons environment via the ``pylons.config``
@@ -54,7 +54,7 @@
     # do this by creating the engine url from components:
     db_config = RawConfigParser()
     db_config.read(config['db_config_file'])
-    
+
     dialect = db_config.get('database', 'dbtype')
     # translate from dbconfig-common terminology
     if dialect == 'sqlite3':
@@ -65,7 +65,7 @@
     db_server = db_config.get('database', 'dbserver')
     db_port = db_config.get('database', 'dbport')
     db_path = db_config.get('database', 'dbpath')
-    
+
     # we support sqlite:// and mysql://
     engine_url = dialect + '://'
     # sqlite needs 4 '/''s, and needs special path options:
@@ -73,9 +73,10 @@
         engine_url += '/' + os.path.join(db_path, schema_name)
     else:
         engine_url += "%s:%s@%s/%s" % (username, password, db_server, schema_name)
-    
+
     engine = create_engine(engine_url)
     init_model(engine)
+    maybe_upgrade_database(engine, global_conf['database_patch_dir'])
 
     # create the Bazaar factory:
     config['bzr.factory'] = BazaarRepositoryFactory(
@@ -84,7 +85,7 @@
         global_conf['bzr_deleted_person_root'],
         global_conf['bzr_deleted_project_root'],
         )
-        
+
     # This is a bit of a nasty hack: In "developer mode", we explicitly call:
     #
     # `paster setup-app /path/to/config.ini`

=== modified file 'sloecode/model/__init__.py'
--- sloecode/model/__init__.py	2011-06-08 07:45:04 +0000
+++ sloecode/model/__init__.py	2012-04-22 06:37:19 +0000
@@ -1,16 +1,76 @@
 """The application's model objects"""
 
+import logging
+
+import os.path
 import sloecode.model.meta
-
 # import all model classes, so the ORM engine knows about them when we
 # configure the session
+from sloecode.model.authkey import AuthKey
+from sloecode.model.membership import Membership
 from sloecode.model.person import Person
 from sloecode.model.project import Project
-from sloecode.model.membership import Membership
-from sloecode.model.authkey import AuthKey
 from sloecode.model.site_role import SiteRole
+from sloecode.model.version import DatabaseVersion
+
+logger = logging.getLogger(__name__)
+CURRENT_SCHEMA_VERSION=4
+
 
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
-    meta.engine = engine
-    meta.Session.configure(bind=engine)
+    sloecode.model.meta.engine = engine
+    sloecode.model.meta.Session.configure(bind=engine)
+
+
+def maybe_upgrade_database(engine, patch_dir):
+    """Function responsible for applying database upgrades, if required."""
+    # assume we're coming from the earliest version possible...
+    from_version=0
+    # Database schema version may not exist, if we're upgrading from source.
+    if not DatabaseVersion.__table__.exists(engine):
+        logger.info("DatabaseVersion table does not exist, creating it now.")
+        DatabaseVersion.__table__.create(engine)
+    try:
+        from_version = get_schema_version()
+    except ValueError:
+        logger.info("No database schema version found, setting it to %d", CURRENT_SCHEMA_VERSION)
+        # If there was no version table, assume we're up to date:
+        from_version = CURRENT_SCHEMA_VERSION
+        set_schema_version(from_version)
+
+    dialect = engine.name
+    for patch_version in range(from_version+1, CURRENT_SCHEMA_VERSION+1):
+        patch_path = os.path.join(patch_dir, dialect, str(patch_version))
+        import pdb; pdb.set_trace()
+        if not os.path.exists(patch_path):
+            logger.warning("Can't find patch to patch database to version %d", patch_version)
+            return
+        patch_text = open(patch_path).read()
+        if not apply_patch(engine, patch_text, patch_version):
+            return
+
+
+def get_schema_version():
+    """Returns the current schema version, or raises ValueError."""
+    [v] = DatabaseVersion.get()
+    return v.version
+
+def set_schema_version(version):
+    try:
+        [v] = DatabaseVersion.get()
+        v.version = version
+    except ValueError:
+        v = DatabaseVersion(version=CURRENT_SCHEMA_VERSION)
+        sloecode.model.meta.Session.add(v)
+    finally:
+        sloecode.model.meta.Session.commit()
+
+
+def apply_patch(engine, patch_sql, to_version):
+    """Apply a patch to the database."""
+    conn = engine.raw_connection()
+    cur = conn.cursor()
+    cur.executescript(patch_sql)
+    set_schema_version(to_version)
+    return True

=== added file 'sloecode/model/version.py'
--- sloecode/model/version.py	1970-01-01 00:00:00 +0000
+++ sloecode/model/version.py	2012-04-22 06:37:19 +0000
@@ -0,0 +1,15 @@
+"""Database version model."""
+
+import logging
+from sqlalchemy import Column
+from sqlalchemy.types import Integer
+
+from sloecode.model.meta import Base, QueryMixin
+
+
+class DatabaseVersion(Base, QueryMixin):
+    "A model that represents the database schema version."
+
+    __tablename__ = "database_version"
+
+    version = Column(Integer, primary_key=True)