Merge branch 'master' into fix-foreign-primary-key-on-conflict-do-nothing

Author: Photonios

.gitignore

@@ -19,3 +19,6 @@ dist/
 
 # Ignore benchmark results
 .benchmarks/
+
+# Ignore temporary tox environments
+.tox/

.scrutinizer.yml

@@ -29,7 +29,7 @@ build:
             - 'pip install coverage --force-reinstall -U'
         override:
             -
-                command: python3 -m pytest --cov=psqlextra
+                command: tox
                 coverage:
                     file: '.coverage'
                     format: 'py-cc'

README.rst

@@ -1,18 +1,20 @@
 
 .. raw:: html
-   
+
     <h1 align="center">
       <img width="400" src="https://i.imgur.com/79S6OVM.png" alt="django-postgres-extra">
       <br>
       <br>
-   </h1>
+    </h1>
 
-=================  ===================
+====================  ===================
 **Quality**           |QualityBadge|_
 **Test coverage**     |CoverageBadge|_
 **License**           |LicenseBadge|_
 **PyPi**              |PyPiBadge|_
-=================  =================== 
+**Django versions**   >=1.11 (including 2.0)
+**Python versions**   >=3.5
+====================  ===================
 
 .. |QualityBadge| image:: https://scrutinizer-ci.com/g/SectorLabs/django-postgres-extra/badges/quality-score.png
 .. _QualityBadge: https://scrutinizer-ci.com/g/SectorLabs/django-postgres-extra/
@@ -37,7 +39,7 @@ Documentation
 -------------
 
 * **ReadTheDocs HTML**
-   
+
   http://django-postgres-extra.readthedocs.io
 
 * **Plain MarkDown**
@@ -53,7 +55,7 @@ Major features
    * Concurrency safe
    * With bulk support (single query)
 
-2. **Extended support for ``HStoreField``**
+2. **Extended support for HStoreField**
 
    * Unique constraints
    * Null constraints
@@ -126,9 +128,9 @@ FAQ - Frequently asked questions
 
    No. Only Python 3.5 or newer is supported. We're using type hints. These do not work well under older versions of Python.
 
-4. **Does this package work with Django 1.X?**
+4. **Which Django versions does this package work with?**
 
-   No. Only Django 1.11 or newer is supported.
+   Django 1.11 or newer (that includes Django 2.0).
 
 
 Working with the code
@@ -145,31 +147,42 @@ Working with the code
 1. Clone the repository:
 
    .. code-block:: bash
-    
+
         λ git clone https://github.com/SectorLabs/django-postgres-extra.git
 
 2. Create a virtual environment:
 
    .. code-block:: bash
-    
+
        λ cd django-postgres-extra
        λ virtualenv env
        λ source env/bin/activate
 
-3. Install the development/test dependencies:
+3. Create a postgres user for use in tests (skip if your default user is a postgres superuser):
+
+   .. code-block:: bash
+
+       λ createuser --superuser psqlextra --pwprompt
+       λ export DATABASE_URL=postgres://psqlextra:<password>@localhost/psqlextra
+
+   Hint: if you're using virtualenvwrapper, you might find it beneficial to put
+   the ``export`` line in ``$VIRTUAL_ENV/bin/postactivate`` so that it's always
+   available when using this virtualenv.
+
+4. Install the development/test dependencies:
 
    .. code-block:: bash
-    
+
        λ pip install -r requirements/test.txt
-    
-4. Run the tests:
+
+5. Run the tests:
 
    .. code-block:: bash
-    
-       λ py.test
-    
-5. Run the benchmarks:
+
+       λ tox
+
+6. Run the benchmarks:
 
    .. code-block:: bash
-    
+
        λ py.test -c pytest-benchmark.ini

psqlextra/compiler.py

@@ -272,7 +272,12 @@ def _format_field_value(self, field_name) -> str:
         return SQLInsertCompiler.prepare_value(
             self,
             field,
-            getattr(self.query.objs[0], field_name)
+            # Note: this deliberately doesn't use `pre_save_val` as we don't
+            # want things like auto_now on DateTimeField (etc.) to change the
+            # value. We rely on pre_save having already been done by the
+            # underlying compiler so that things like FileField have already had
+            # the opportunity to save out their data.
+            getattr(self.query.objs[0], field.attname)
         )
 
     def _normalize_field_name(self, field_name) -> str:

psqlextra/indexes/conditional_unique_index.py

@@ -1,3 +1,4 @@
+import django
 from django.db.models.indexes import Index
 
 
@@ -24,13 +25,18 @@ def __init__(self, condition: str, fields=[], name=None):
 
     def create_sql(self, model, schema_editor, using=''):
         """Creates the actual SQL used when applying the migration."""
-
-        sql_create_index = self.sql_create_index
-        sql_parameters = {
-            **Index.get_sql_create_template_values(self, model, schema_editor, using),
-            'condition': self.condition
-        }
-        return sql_create_index % sql_parameters
+        if django.VERSION >= (2, 0):
+            statement = super().create_sql(model, schema_editor, using)
+            statement.template = self.sql_create_index
+            statement.parts['condition'] = self.condition
+            return statement
+        else:
+            sql_create_index = self.sql_create_index
+            sql_parameters = {
+                **Index.get_sql_create_template_values(self, model, schema_editor, using),
+                'condition': self.condition
+            }
+            return sql_create_index % sql_parameters
 
     def deconstruct(self):
         """Serializes the :see:ConditionalUniqueIndex for the migrations file."""

psqlextra/manager/manager.py

@@ -93,7 +93,10 @@ def update(self, **fields):
 
         # build up the query to execute
         self._for_write = True
-        query = self.query.clone(UpdateQuery)
+        if django.VERSION >= (2, 0):
+            query = self.query.chain(UpdateQuery)
+        else:
+            query = self.query.clone(UpdateQuery)
         query._annotations = None
         query.add_update_values(fields)
 

psqlextra/query.py

@@ -99,7 +99,7 @@ def add_fields(self, field_names: List[str], allow_m2m: bool=True) -> bool:
 
         alias = self.get_initial_alias()
         opts = self.get_meta()
-
+        cols = []
         for name in field_names:
             parts = name.split(LOOKUP_SEP)
 
@@ -108,7 +108,7 @@ def add_fields(self, field_names: List[str], allow_m2m: bool=True) -> bool:
                 column_name, hstore_key = parts[:2]
                 is_hstore, field = self._is_hstore_field(column_name)
                 if is_hstore:
-                    self.add_select(
+                    cols.append(
                         HStoreColumn(self.model._meta.db_table or self.model.name, field, hstore_key)
                     )
                     continue
@@ -117,7 +117,9 @@ def add_fields(self, field_names: List[str], allow_m2m: bool=True) -> bool:
             targets, final_alias, joins = self.trim_joins(targets, joins, path)
 
             for target in targets:
-                self.add_select(target.get_col(final_alias))
+                cols.append(target.get_col(final_alias))
+        if cols:
+            self.set_select(cols)
 
     def _is_hstore_field(self, field_name: str) -> Tuple[bool, Optional[models.Field]]:
         """Gets whether the field with the specified name is a

requirements/analysis.txt

@@ -1,5 +1,5 @@
 # pylint
 pylint-celery==0.3
-pylint-common==0.2.2
-pylint-django==0.7.2
-pylint-plugin-utils==0.2.4
+pylint-common==0.2.5
+pylint-django==0.8.0
+pylint-plugin-utils==0.2.6

requirements/base.txt

@@ -1 +1 @@
-enforce==0.3.2
+enforce==0.3.4

requirements/test.txt

@@ -1,19 +1,17 @@
 -r base.txt
 
-coverage==4.2
-Django==1.11.1
-django-coverage-plugin==1.3.1
 psycopg2==2.7.3.2
-pylint==1.6.4
-pylint-common==0.2.2
-pylint-django==0.7.2
-pylint-plugin-utils==0.2.4
-coverage==4.2
+pylint==1.8.1
+pylint-common==0.2.5
+pylint-django==0.8.0
+pylint-plugin-utils==0.2.6
+coverage==4.4.2
 django-coverage-plugin==1.3.1
-flake8==3.0.4
-pep8==1.7.0
-dj-database-url==0.4.1
-pytest==3.0.6
-pytest-benchmark==3.0.0
+flake8==3.5.0
+pep8==1.7.1
+dj-database-url==0.4.2
+pytest==3.3.2
+pytest-benchmark==3.1.1
 pytest-django==3.1.2
-pytest-cov==2.4.0
+pytest-cov==2.5.1
+tox==2.9.1