From aed5870b2fd2fa08a3b3a7f590bb93bba4c61b53 Mon Sep 17 00:00:00 2001
From: Jared Lewis <jared.lewis@ambition.com>
Date: Fri, 21 Apr 2017 12:37:05 -0400
Subject: [PATCH] Fix tests

---
 querybuilder/query.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/querybuilder/query.py b/querybuilder/query.py
index 045c729..0340ea1 100644
--- a/querybuilder/query.py
+++ b/querybuilder/query.py
@@ -1750,7 +1750,7 @@ def upsert(self, rows, unique_fields, update_fields, return_rows=False, return_m
                 unique_fields,
                 update_fields,
                 auto_field_name=auto_field_name,
-                return_rows=return_models
+                return_rows=return_rows or return_models
             )
 
             # get the cursor to execute the query
@@ -1769,7 +1769,7 @@ def upsert(self, rows, unique_fields, update_fields, return_rows=False, return_m
                 update_fields,
                 auto_field_name=auto_field_name,
                 only_insert=True,
-                return_rows=return_models
+                return_rows=return_rows or return_models
             )
 
             # get the cursor to execute the query