Merge pull request #111 from ambitioninc/develop

1.4.0

.travis.yml

@@ -1,33 +1,30 @@
+dist: xenial
+
 language: python
 
 sudo: false
 
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
   - "3.6"
+  - "3.7"
 
 env:
   matrix:
-    - DJANGO=1.10
-    - DJANGO=1.11
     - DJANGO=2.0
+    - DJANGO=2.1
+    - DJANGO=2.2
     - DJANGO=master
 
 addons:
-  postgresql: '9.5'
+  postgresql: '9.6'
 
 matrix:
+  exclude:
+    - { python: "3.7", env: DJANGO=2.0 }
+
   include:
     - { python: "3.6", env: TOXENV=flake8 }
 
-  exclude:
-    - { python: "2.7", env: DJANGO=master }
-    - { python: "2.7", env: DJANGO=2.0 }
-    - { python: "3.4", env: DJANGO=master }
-    - { python: "3.6", env: DJANGO=1.10 }
-
   allow_failures:
     - env: DJANGO=master
 

docs/release_notes.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+v1.4.0
+------
+* Only support django >= 2.0 and python >= 3.6
+* Fix bulk upsert sql issue to distinguish fields by table
+
 v1.3.2
 ------
 * Fix bulk_update not properly casting fields

manager_utils/manager_utils.py

@@ -43,12 +43,19 @@ def _get_upserts_distinct(queryset, model_objs_updated, model_objs_created, uniq
     # Keep track of the created models
     created_models = []
 
+    # Add table name to unique fields
+    table_name = queryset.model._meta.db_table
+    unique_fields_sql = [
+        '"{0}"."{1}"'.format(table_name, unique_field)
+        for unique_field in unique_fields
+    ]
+
     # If we created new models query for them
     if model_objs_created:
         created_models.extend(
             queryset.extra(
                 where=['({unique_fields_sql}) in %s'.format(
-                    unique_fields_sql=', '.join(unique_fields)
+                    unique_fields_sql=', '.join(unique_fields_sql)
                 )],
                 params=[
                     tuple([

manager_utils/version.py

@@ -1 +1 @@
-__version__ = '1.3.2'
+__version__ = '1.4.0'

tox.ini

@@ -1,22 +1,23 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35}-django110
-    py{27,34,35,36}-django111
-    py{34,35,36}-django20
-    py{35,36}-djangomaster
+    py{36}-django20
+    py{36,37}-django21
+    py{36,37}-django22
+    py{36,37}-djangomaster
 
 [testenv]
 setenv =
     DB = postgres
 deps =
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     -rrequirements/requirements-testing.txt
 commands =
-    coverage run setup.py test
+    coverage run --concurrency=multiprocessing setup.py test
+    coverage combine
     coverage report --fail-under=100
 
 [testenv:flake8]
@@ -25,7 +26,7 @@ commands = flake8 manager_utils
 
 [travis:env]
 DJANGO =
-    1.10: django110
-    1.11: django111
     2.0: django20
+    2.1: django21
+    2.2: django22
     master: djangomaster