Merge pull request #98 from ambitioninc/develop

1.2.0
ambitioninc · Jul 11, 2019 · 0c47cd1 · 0c47cd1
2 parents b8c1fd4 + fd0c6e5
commit 0c47cd1
Show file tree

Hide file tree

Showing 21 changed files with 360 additions and 248 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,33 +1,28 @@
+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
 

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+v1.2.0
+------
+* Add Django 2.1
+* Add Django 2.2
+* Add python 3.7
+* Drop python 2.7
+* Drop python 3.4
+* Drop python 3.5
+* Drop Django 1.10
+
 v1.1.0
 ------
 * Use tox to support more versions

diff --git a/querybuilder/query.py b/querybuilder/query.py
@@ -173,8 +173,7 @@ def set_right_table(self, table):
             # check if this join type is for a foreign key
             for field in self.left_table.model._meta.fields:
                 if (
-                    field.get_internal_type() == 'OneToOneField' or
-                    field.get_internal_type() == 'ForeignKey'
+                    field.get_internal_type() == 'OneToOneField' or field.get_internal_type() == 'ForeignKey'
                 ):
                     if field.remote_field.model == self.right_table.model:
                         if self.right_table.field_prefix is None:
@@ -213,8 +212,7 @@ def get_condition(self):
             # check if this join type is for a foreign key
             for field in self.right_table.model._meta.fields:
                 if (
-                    field.get_internal_type() == 'OneToOneField' or
-                    field.get_internal_type() == 'ForeignKey'
+                    field.get_internal_type() == 'OneToOneField' or field.get_internal_type() == 'ForeignKey'
                 ):
                     if field.remote_field.model == self.left_table.model:
                         table_join_field = field.column
@@ -1159,11 +1157,32 @@ def get_update_sql(self, rows):
         row_values = []
         sql_args = []
 
-        for row in rows:
+        # Loop over each row and put the %s placeholder for each field
+        for i, row in enumerate(rows):
+
+            # Build a list of each field's placeholder
             placeholders = []
-            for value in row:
-                sql_args.append(value)
-                placeholders.append('%s')
+
+            # If this is the first row, add casting information so the db knows the field types
+            if i == 0 and hasattr(self.tables[0], 'model'):
+                for field_index, value in enumerate(row):
+                    # Append the value
+                    sql_args.append(value)
+
+                    # Figure out how to cast it
+                    field_object = self.tables[0].model._meta.get_field(field_names[field_index])
+                    db_type = field_object.db_type(self.connection)
+
+                    # Don't cast the pk
+                    if db_type == 'serial':
+                        placeholders.append('%s')
+                    else:
+                        # Cast the placeholder to the data type
+                        placeholders.append('%s::{0}'.format(db_type))
+            else:
+                for value in row:
+                    sql_args.append(value)
+                    placeholders.append('%s')
             row_values.append('({0})'.format(', '.join(placeholders)))
         row_values_sql = ', '.join(row_values)
 

diff --git a/querybuilder/tests/__init__.py b/querybuilder/tests/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'querybuilder.tests.apps.QuerybuilderTestConfig'
diff --git a/querybuilder/tests/aggregate_tests.py b/querybuilder/tests/aggregate_tests.py
@@ -57,7 +57,7 @@ def test_avg(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT AVG(tests_order.margin) AS "margin_avg" FROM tests_order'
+        expected_query = 'SELECT AVG(querybuilder_tests_order.margin) AS "margin_avg" FROM querybuilder_tests_order'
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_max_field(self):
@@ -71,7 +71,7 @@ def test_max_field(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT MAX(tests_order.margin) AS "margin_max" FROM tests_order'
+        expected_query = 'SELECT MAX(querybuilder_tests_order.margin) AS "margin_max" FROM querybuilder_tests_order'
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_min_field(self):
@@ -85,7 +85,7 @@ def test_min_field(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT MIN(tests_order.margin) AS "margin_min" FROM tests_order'
+        expected_query = 'SELECT MIN(querybuilder_tests_order.margin) AS "margin_min" FROM querybuilder_tests_order'
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_stddev(self):
@@ -96,7 +96,9 @@ def test_stddev(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT STDDEV(tests_order.margin) AS "margin_stddev" FROM tests_order'
+        expected_query = (
+            'SELECT STDDEV(querybuilder_tests_order.margin) AS "margin_stddev" FROM querybuilder_tests_order'
+        )
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_sum_field(self):
@@ -110,7 +112,7 @@ def test_sum_field(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT SUM(tests_order.margin) AS "margin_sum" FROM tests_order'
+        expected_query = 'SELECT SUM(querybuilder_tests_order.margin) AS "margin_sum" FROM querybuilder_tests_order'
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_variance(self):
@@ -121,7 +123,9 @@ def test_variance(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT VARIANCE(tests_order.margin) AS "margin_variance" FROM tests_order'
+        expected_query = (
+            'SELECT VARIANCE(querybuilder_tests_order.margin) AS "margin_variance" FROM querybuilder_tests_order'
+        )
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_count(self):
@@ -139,7 +143,10 @@ def test_count(self):
                 received
             )
         )
-        self.assertEqual(query.get_count_query().get_sql(), 'SELECT COUNT(tests_user.*) AS "all_count" FROM tests_user')
+        self.assertEqual(
+            query.get_count_query().get_sql(),
+            'SELECT COUNT(querybuilder_tests_user.*) AS "all_count" FROM querybuilder_tests_user'
+        )
 
         # Make sure the copy didn't modify the original
         self.assertEqual(len(query.tables[0].fields), 2)

diff --git a/querybuilder/tests/apps.py b/querybuilder/tests/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class QuerybuilderTestConfig(AppConfig):
+    name = 'querybuilder.tests'
+    label = 'querybuilder_tests'
+    verbose_name = 'querybuilder Tests'
diff --git a/querybuilder/tests/date_tests.py b/querybuilder/tests/date_tests.py
@@ -13,7 +13,10 @@ def test_year(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year" FROM tests_order'
+        expected_query = (
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year" '
+            'FROM querybuilder_tests_order'
+        )
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
 
     def test_year_auto(self):
@@ -25,9 +28,9 @@ def test_year_auto(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'year\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'year\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -42,9 +45,9 @@ def test_year_auto_desc(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'year\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'year\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__epoch '
             'ORDER BY time__epoch DESC'
         )
@@ -59,10 +62,10 @@ def test_month_auto(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(month FROM tests_order.time) AS INT) AS "time__month", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'month\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(month FROM querybuilder_tests_order.time) AS INT) AS "time__month", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'month\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__month, time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -77,12 +80,12 @@ def test_hour_auto(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(month FROM tests_order.time) AS INT) AS "time__month", '
-            'CAST(EXTRACT(day FROM tests_order.time) AS INT) AS "time__day", '
-            'CAST(EXTRACT(hour FROM tests_order.time) AS INT) AS "time__hour", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'hour\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(month FROM querybuilder_tests_order.time) AS INT) AS "time__month", '
+            'CAST(EXTRACT(day FROM querybuilder_tests_order.time) AS INT) AS "time__day", '
+            'CAST(EXTRACT(hour FROM querybuilder_tests_order.time) AS INT) AS "time__hour", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'hour\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__month, time__day, time__hour, time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -97,13 +100,13 @@ def test_minute_auto(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(month FROM tests_order.time) AS INT) AS "time__month", '
-            'CAST(EXTRACT(day FROM tests_order.time) AS INT) AS "time__day", '
-            'CAST(EXTRACT(hour FROM tests_order.time) AS INT) AS "time__hour", '
-            'CAST(EXTRACT(minute FROM tests_order.time) AS INT) AS "time__minute", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'minute\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(month FROM querybuilder_tests_order.time) AS INT) AS "time__month", '
+            'CAST(EXTRACT(day FROM querybuilder_tests_order.time) AS INT) AS "time__day", '
+            'CAST(EXTRACT(hour FROM querybuilder_tests_order.time) AS INT) AS "time__hour", '
+            'CAST(EXTRACT(minute FROM querybuilder_tests_order.time) AS INT) AS "time__minute", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'minute\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__month, time__day, time__hour, time__minute, time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -118,14 +121,14 @@ def test_second_auto(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(year FROM tests_order.time) AS INT) AS "time__year", '
-            'CAST(EXTRACT(month FROM tests_order.time) AS INT) AS "time__month", '
-            'CAST(EXTRACT(day FROM tests_order.time) AS INT) AS "time__day", '
-            'CAST(EXTRACT(hour FROM tests_order.time) AS INT) AS "time__hour", '
-            'CAST(EXTRACT(minute FROM tests_order.time) AS INT) AS "time__minute", '
-            'CAST(EXTRACT(second FROM tests_order.time) AS INT) AS "time__second", '
-            'CAST(EXTRACT(epoch FROM date_trunc(\'second\', tests_order.time)) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(year FROM querybuilder_tests_order.time) AS INT) AS "time__year", '
+            'CAST(EXTRACT(month FROM querybuilder_tests_order.time) AS INT) AS "time__month", '
+            'CAST(EXTRACT(day FROM querybuilder_tests_order.time) AS INT) AS "time__day", '
+            'CAST(EXTRACT(hour FROM querybuilder_tests_order.time) AS INT) AS "time__hour", '
+            'CAST(EXTRACT(minute FROM querybuilder_tests_order.time) AS INT) AS "time__minute", '
+            'CAST(EXTRACT(second FROM querybuilder_tests_order.time) AS INT) AS "time__second", '
+            'CAST(EXTRACT(epoch FROM date_trunc(\'second\', querybuilder_tests_order.time)) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__year, time__month, time__day, time__hour, time__minute, time__second, time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -140,8 +143,8 @@ def test_group_none(self):
         )
         query_str = query.get_sql()
         expected_query = (
-            'SELECT CAST(EXTRACT(epoch FROM tests_order.time) AS INT) AS "time__epoch" '
-            'FROM tests_order '
+            'SELECT CAST(EXTRACT(epoch FROM querybuilder_tests_order.time) AS INT) AS "time__epoch" '
+            'FROM querybuilder_tests_order '
             'GROUP BY time__epoch '
             'ORDER BY time__epoch ASC'
         )
@@ -155,5 +158,5 @@ def test_group_all(self):
             ]
         )
         query_str = query.get_sql()
-        expected_query = 'SELECT CAST(0 AS INT) AS "time__epoch" FROM tests_order'
+        expected_query = 'SELECT CAST(0 AS INT) AS "time__epoch" FROM querybuilder_tests_order'
         self.assertEqual(query_str, expected_query, get_comparison_str(query_str, expected_query))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		default_app_config = 'querybuilder.tests.apps.QuerybuilderTestConfig'