Merge pull request #21 from micahhausler/newfeature/query-connection

Newfeature/query connection

.coveragerc

@@ -2,7 +2,6 @@
 branch = True
 omit =
     querybuilder/migrations/*
-    querybuilder/tests/*
     querybuilder/version.py
 source = querybuilder
 [report]
@@ -12,5 +11,5 @@ exclude_lines =
 
     # Don't complain if tests don't hit defensive assertion code:
     raise NotImplementedError
-fail_under = 87
+fail_under = 92
 show_missing = True

.travis.yml

@@ -9,9 +9,12 @@ env:
   matrix:
     - DJANGO=1.6.5
 install:
-  - pip install -q coverage flake8 Django==$DJANGO
+  - pip install -q coverage coveralls flake8 Django==$DJANGO
 before_script:
   - psql -c 'CREATE DATABASE querybuilder;' -U postgres
 script:
+  - flake8 .
   - coverage run setup.py test
-  - coverage report --fail-under=87
+  - coverage report --fail-under=92
+after_success:
+  coveralls

README.rst

@@ -1,6 +1,16 @@
 .. image:: https://travis-ci.org/ambitioninc/django-query-builder.png
    :target: https://travis-ci.org/ambitioninc/django-query-builder
 
+.. image:: https://coveralls.io/repos/ambitioninc/django-query-builder/badge.png?branch=develop
+    :target: https://coveralls.io/r/ambitioninc/django-query-builder?branch=develop
+
+.. image:: https://pypip.in/v/django-query-builder/badge.png
+    :target: https://crate.io/packages/django-query-builder/
+    :alt: Latest PyPI version
+
+.. image:: https://pypip.in/d/django-query-builder/badge.png
+    :target: https://crate.io/packages/django-query-builder/
+
 django-query-builder
 ====================
 querybuilder is a django library for assisting with the construction and
@@ -24,7 +34,8 @@ where django querysets simplify the sql generation process for simple queries.
 
 Requirements
 ------------
-* Python 2.7+
+* Python 2.7
+* Python 3.3, 3.4
 * Django 1.4+
 
 Installation

docs/conf.py

@@ -63,7 +63,7 @@ def get_version():
 
 intersphinx_mapping = {
     'python': ('http://python.readthedocs.org/en/v2.7.2/', None),
-    'django': ('http://django.readthedocs.org/en/latest/', None),
+    'django': ('http://django.readthedocs.org/en/1.7.x/', None),
     #'celery': ('http://celery.readthedocs.org/en/latest/', None),
 }
 

docs/ref/fields.rst

@@ -1,7 +1,7 @@
 .. _ref-fields:
 
-fields
-======
+Field API documentation
+=======================
 
 .. automodule:: querybuilder.fields
 

docs/ref/query.rst

@@ -1,7 +1,7 @@
 .. _ref-query:
 
-query
-=====
+Query API documentation
+=======================
 
 .. automodule:: querybuilder.query
 

docs/ref/tables.rst

@@ -1,7 +1,7 @@
 .. _ref-tables:
 
-tables
-======
+Tables API documentation
+========================
 
 .. automodule:: querybuilder.tables
 

docs/release_notes.rst

@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+v0.5.8
+------
+
+* Added connection parameter to query for multiple database support
+* flake8 cleanup
+
 v0.5.7
 ------
 

docs/usage_examples.rst

@@ -151,6 +151,25 @@ Inner queries
     inner_query = Query().from_table(Account)
     outer_query = Query().from_table(inner_query)
 
+Connection Setup
+----------------
+
+Arbitrary django connections can be passed into the Query constructor to connect to alternate databases.
+
+.. code-block:: python
+
+    from django.db import connections
+    from querybuilder.query import Query
+
+    connections.all()
+    #[<django.db.backends.postgresql_psycopg2.base.DatabaseWrapper at 0x1127b4390>,
+    # <django.db.backends.postgresql_psycopg2.base.DatabaseWrapper at 0x1127b44d0>]
+
+    Query(connections.all()[0]).from_table('auth_user').count()
+    # 15L
+    Query(connections.all()[1]).from_table('auth_user').count()
+    # 223L
+
 Reference Material
 ------------------
 * http://www.postgresql.org/docs/9.1/static/functions-window.html