Merge lp:~james-w/udd/multi-db into lp:udd

[James Westby]

Hi,

This configures django to have multiple dbs, using the same files
as the existing db files.

There will be no behaviour change here, it's just setting up the
aliases for later use.

Thanks,

James

[Jonathan Lange (jml)]

review: Approve

Unmerged revisions

565. By James Westby on 2011-12-14

Merged management-commands into multi-db.

564. By James Westby on 2011-12-13

Turns out that django requires a default db, contrary to the docs.

563. By James Westby on 2011-12-13

Dont use the deleted paths module.

562. By James Westby on 2011-12-13

Don't have a default db so that every access has to be qualified.

561. By James Westby on 2011-12-13

Merged management-commands into multi-db.

560. By James Westby on 2011-12-13

Define the different databases.

559. By James Westby on 2011-12-10

Move the deletion of revids in to another script.

It's import-package specific, so it doesn't really belong in the
requeue script.

558. By James Westby on 2011-12-10

Add management commands for the things that touch the db.

557. By James Westby on 2011-12-10

Drop it from the crontab too.

556. By James Westby on 2011-12-10

Drop email_failures as it isn't used.

=== modified file 'django_project/settings.py'
--- django_project/settings.py	2011-12-14 19:02:23 +0000
+++ django_project/settings.py	2011-12-14 19:02:23 +0000
@@ -1,5 +1,9 @@
 # Django settings for django_project project.
 
+from udd import iconfig
+
+udd_conf = iconfig.ImporterStack()
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -12,12 +16,28 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'udd.db',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
+        'NAME': udd_conf.get('pi.sqlite_file'),                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    },
+    'packages': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': udd_conf.get('pi.sqlite_package_file'),                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    },
+    'history': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': udd_conf.get('pi.sqlite_history_file'),                      # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    },
 }
 
 # Local time zone for this installation. Choices can be found here: