Merge 1acee60 into 825e7a5

palewire · Dec 2, 2017 · edcba45 · edcba45
2 parents 825e7a5 + 1acee60
commit edcba45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -17,30 +17,39 @@ env:
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.4
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.4
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.4
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.4
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.5
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.5
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.5
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.5
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.6
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.5.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.6
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.6.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.8.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.10.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.6
  - DJANGO_VERSION=1.11.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.6
+ - DJANGO_VERSION=2.0.* PSYCOPG2_VERSION=2.7.* POSTGRESQL_VERSION=9.6
 
 before_install:
   - sudo service postgresql stop && sudo service postgresql start $POSTGRESQL_VERSION

diff --git a/postgres_copy/__init__.py b/postgres_copy/__init__.py
@@ -22,7 +22,10 @@ def to_csv(self, csv_path, *fields, **kwargs):
         """
         Copy current QuerySet to CSV at provided path.
         """
-        query = self.query.clone(CopyToQuery)
+        try:
+            query = self.query.chain(CopyToQuery)
+        except AttributeError:
+            query = self.query.clone(CopyToQuery)
 
         # Get fields
         query.copy_to_fields = fields