Merge branch 'develop' into feature/AleaIdField_as_primary_key

This commit is contained in:
Tyson Clugg 2015-07-16 09:06:48 +10:00
commit 01f6d9eed4
4 changed files with 12 additions and 3 deletions

View file

@ -1,6 +1,15 @@
Change Log
==========
0.9.12
------
* Bugfix /app.model/schema helper method on collections to work with
more model field types.
0.9.11
------
* Fix bug in post login/logout subscription handling.
0.9.10
------
* Fix bug in Accounts.forgotPassword implementation.

View file

@ -1,3 +1,3 @@
#!/bin/sh
cd "${0%/*}"
cat setup.py | sed -e "s/version='[0123456789]\+\.[0123456789]\+\.[01234567989]\+'/version='$( git rev-parse --abbrev-ref HEAD | cut -d / -f 2 )'/" > setup.py
cat setup.py | sed -e "s/version='[0123456789]\{1,\}\.[0123456789]\{1,\}\.[01234567989]\{1,\}'/version='$( git rev-parse --abbrev-ref HEAD | cut -d / -f 2 )'/" > setup.py

View file

@ -300,7 +300,7 @@ class Collection(APIMixin):
}
# Django supports model._meta -> pylint: disable=W0212
meta = self.model._meta
connection = router.db_for_read(self.model.objects.none())
connection = connections[router.db_for_read(self.model.objects.none())]
for field in meta.local_fields:
int_type = field.get_internal_type()
schema = {

View file

@ -5,7 +5,7 @@ from setuptools import setup, find_packages
setup(
name='django-ddp',
version='0.9.10',
version='0.9.12',
description=__doc__,
long_description=open('README.rst').read(),
author='Tyson Clugg',