Merge pull request #16 from BertrandBordage/master

Add a postgis backend.

.travis.yml

@@ -8,42 +8,61 @@ env:
   matrix:
     - TOXENV=py27-django16-sqlite3
     - TOXENV=py27-django16-pg
+    - TOXENV=py27-django16-postgis
     - TOXENV=py27-django17-sqlite3
     - TOXENV=py27-django17-pg
+    - TOXENV=py27-django17-postgis
     - TOXENV=py27-djangotrunk-sqlite3
     - TOXENV=py27-djangotrunk-pg
+    - TOXENV=py27-djangotrunk-postgis
     - TOXENV=py32-django16-sqlite3
     - TOXENV=py32-django16-pg
+    - TOXENV=py32-django16-postgis
     - TOXENV=py32-django17-sqlite3
     - TOXENV=py32-django17-pg
+    - TOXENV=py32-django17-postgis
     - TOXENV=py32-djangotrunk-sqlite3
     - TOXENV=py32-djangotrunk-pg
+    - TOXENV=py32-djangotrunk-postgis
     - TOXENV=py33-django16-sqlite3
     - TOXENV=py33-django16-pg
+    - TOXENV=py33-django16-postgis
     - TOXENV=py33-django17-sqlite3
     - TOXENV=py33-django17-pg
+    - TOXENV=py33-django17-postgis
     - TOXENV=py33-djangotrunk-sqlite3
     - TOXENV=py33-djangotrunk-pg
+    - TOXENV=py33-djangotrunk-postgis
     - TOXENV=py34-django16-sqlite3
     - TOXENV=py34-django16-pg
+    - TOXENV=py34-django16-postgis
     - TOXENV=py34-django17-sqlite3
     - TOXENV=py34-django17-pg
+    - TOXENV=py34-django17-postgis
     - TOXENV=py34-djangotrunk-sqlite3
     - TOXENV=py34-djangotrunk-pg
+    - TOXENV=py34-djangotrunk-postgis
     - TOXENV=pypy-django16-sqlite3
     - TOXENV=pypy-django16-pg
+    - TOXENV=pypy-django16-postgis
     - TOXENV=pypy-django17-sqlite3
     - TOXENV=pypy-django17-pg
+    - TOXENV=pypy-django17-postgis
     - TOXENV=pypy-djangotrunk-sqlite3
     - TOXENV=pypy-djangotrunk-pg
+    - TOXENV=pypy-djangotrunk-postgis
     - TOXENV=pypy3-django16-sqlite3
     - TOXENV=pypy3-django16-pg
+    - TOXENV=pypy3-django16-postgis
     - TOXENV=pypy3-django17-sqlite3
     - TOXENV=pypy3-django17-pg
+    - TOXENV=pypy3-django17-postgis
     - TOXENV=pypy3-djangotrunk-sqlite3
     - TOXENV=pypy3-djangotrunk-pg
+    - TOXENV=pypy3-djangotrunk-postgis
     - TOXENV=py26-django16-sqlite3
     - TOXENV=py26-django16-pg
+    - TOXENV=py26-django16-postgis
     - TOXENV=py26-django16-mysql
     - TOXENV=py27-django16-mysql
     - TOXENV=py27-django17-mysql
@@ -66,6 +85,7 @@ install: travis_retry pip install tox coveralls
 before_script:
   - mysql -e 'create database dtc;'
   - psql -c 'create database dtc;' -U postgres
+  - psql -c 'create extension postgis;' -U postgres dtc
 
 script: tox -e $TOXENV
 

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{27,32,33,34,py,py3}-django{16,17,trunk}-{sqlite3,pg},
-    py26-django16-{sqlite3,pg,mysql},
+    py{27,32,33,34,py,py3}-django{16,17,trunk}-{sqlite3,pg,postgis},
+    py26-django16-{sqlite3,pg,postgis,mysql},
     py{27,32,33,34,py}-django{16,17,trunk}-mysql,
 
 [testenv]
@@ -13,14 +13,15 @@ deps =
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     djangotrunk: https://github.com/django/django/tarball/master
-    pg-py{26,27,32,33,34}: psycopg2==2.5.2
-    pg-pypy: psycopg2cffi==2.5.2
-    pg-pypy3: https://github.com/chtd/psycopg2cffi/tarball/py3
+    {pg,postgis}-py{26,27,32,33,34}: psycopg2==2.5.2
+    {pg,postgis}-pypy: psycopg2cffi==2.5.2
+    {pg,postgis}-pypy3: https://github.com/chtd/psycopg2cffi/tarball/py3
     mysql-py{26,27,py}: MySQL-python==1.2.5
     mysql-py{32,33,34}: https://github.com/clelland/MySQL-for-Python-3/tarball/master
 setenv =
     sqlite3: DJANGO_SETTINGS_MODULE = transaction_hooks.test.settings_sqlite3
     pg: DJANGO_SETTINGS_MODULE = transaction_hooks.test.settings_pg
+    postgis: DJANGO_SETTINGS_MODULE = transaction_hooks.test.settings_postgis
     mysql: DJANGO_SETTINGS_MODULE = transaction_hooks.test.settings_mysql
 commands =
     coverage run -a runtests.py transaction_hooks/test --tb short

transaction_hooks/backends/postgis/base.py

@@ -0,0 +1,8 @@
+from django.contrib.gis.db.backends.postgis import base
+
+from transaction_hooks.mixin import TransactionHooksDatabaseWrapperMixin
+
+
+class DatabaseWrapper(TransactionHooksDatabaseWrapperMixin,
+                      base.DatabaseWrapper):
+    pass

transaction_hooks/test/settings_postgis.py

@@ -0,0 +1,26 @@
+import os
+
+try:
+    from psycopg2cffi import compat
+    compat.register()
+except ImportError:
+    pass
+
+from .settings import *  # noqa
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'transaction_hooks.backends.postgis',
+        'NAME': 'dtc',
+        },
+    }
+
+
+if 'DTC_PG_USERNAME' in os.environ:
+    DATABASES['default'].update(
+        {
+            'USER': os.environ['DTC_PG_USERNAME'],
+            'PASSWORD': '',
+            'HOST': 'localhost',
+            }
+        )