Merge remote-tracking branch 'origin/flab' into generic

diff --git a/flab.txt b/flab.txt
new file mode 100644 (file)
index 0000000..dd157b4
--- /dev/null
+++ b/flab.txt
@@ -0,0 +1 @@
+starting a feature branch

diff --git a/migrate/migrations/README b/migrate/migrations/README
new file mode 100644 (file)
index 0000000..6218f8c
--- /dev/null
+++ b/migrate/migrations/README
@@ -0,0 +1,4 @@
+This is a database migration repository.
+
+More information at
+http://code.google.com/p/sqlalchemy-migrate/

diff --git a/migrate/migrations/__init__.py b/migrate/migrations/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/migrate/migrations/__init__.pyc b/migrate/migrations/__init__.pyc
new file mode 100644 (file)
index 0000000..89ea7ef
Binary files /dev/null and b/migrate/migrations/__init__.pyc differ

diff --git a/migrate/migrations/manage.py b/migrate/migrations/manage.py
new file mode 100644 (file)
index 0000000..2a928c8
--- /dev/null
+++ b/migrate/migrations/manage.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from migrate.versioning.shell import main
+main(debug='False')

diff --git a/migrate/migrations/migrate.cfg b/migrate/migrations/migrate.cfg
new file mode 100644 (file)
index 0000000..ada53f7
--- /dev/null
+++ b/migrate/migrations/migrate.cfg
@@ -0,0 +1,20 @@
+[db_settings]
+# Used to identify which repository this database is versioned under.
+# You can use the name of your project.
+repository_id=the text provided at migrate creation time
+
+# The name of the database table used to track the schema version.
+# This name shouldn't already be used by your project.
+# If this is changed once a database is under version control, you'll need to 
+# change the table name in each database too. 
+version_table=migrate_version
+
+# When committing a change script, Migrate will attempt to generate the 
+# sql for all supported databases; normally, if one of them fails - probably
+# because you don't have that database installed - it is ignored and the 
+# commit continues, perhaps ending successfully. 
+# Databases in this list MUST compile successfully during a commit, or the 
+# entire commit will fail. List the databases your application will actually 
+# be using to ensure your updates to that database work properly.
+# This must be a list; example: ['postgres','sqlite']
+required_dbs=[]

diff --git a/migrate/migrations/versions/__init__.py b/migrate/migrations/versions/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/migrate/migrations/versions/__init__.pyc b/migrate/migrations/versions/__init__.pyc
new file mode 100644 (file)
index 0000000..05c782c
Binary files /dev/null and b/migrate/migrations/versions/__init__.pyc differ