Issue #55 - Database Backend Support For Django 1.7 #62
Conversation
I managed to find the new location for everything except annotations. I tried self.query.get_aggregation(self.connection.alias) but that gave me a recursion error. I'm pretty sure that if an annotation isn't included in the query, it's set to true.
* Refactored legacy _decode_child code from 'master' branch into a decode_child sub (nested) method. * Made a second conditional decode child method which gets defined if django.VERSION >= (1, 7). This method has @kavdev's implementation for Django 1.7 support. * Added a way for a person creating a database backend to implement annotation functionality. I don't think this will be supported well by the rest of djangotoolbox but for this part it should help expanding these features in the future if desired. Implementing that functionallity is outside the scope of this pull request/issue.
|
OK This is ready to be reviewed now. Is this ready for a merge? Normally I would rebase everything into one commit but I wanted to keep @kavdev's initial commit since he did a bulk of the work in figuring out how to query this new API. |
|
Great stuff @sethdenner! Can you update this to follow the existing coding style? Its a bit hard to see what is new code and what is reformatting. Also, do these test suites still pass? |
|
Would you prefer that I leave the original formatting and to hell with pep-8? Or would adding comments indicating where the code was refactor from be better? |
|
There were only a few pep8 errors. In my experience, it's safe to --ignore=E501,E114,E116,E128. Here's the atomic version of @sethdenner's commit https://github.com/kavdev/djangotoolbox/commit/03cb2429901a4025db2339dcabe4c760586755d2 The tests won't pass with python 3. #60 seems to have a solution, but I haven't taken a deep look at it. |
|
Closing because this was merged in #63 |
I got a start on this tonight. Not ready for merge yet.
I just took @kavdev's implementation for _decode_child and refactored it into a sub method definition called decode_child and did the same with the _decode_child implementation from master and put it in a second decode_child definition. Currently I'm using @kavdev's for django.VERSION >= (1, 7) and using the deffinition from master in all other cases.
I still need to fingure out the proper way to get the annotation parameter and verify that the tests pass before this gets mereged.