Merge pull request #89 from ambitioninc/develop

0.15.0

Author: somewes

.travis.yml

@@ -4,28 +4,16 @@ python:
   - '2.7'
   - '3.4'
   - '3.5'
+  - '3.6'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
     - DJANGO=">=1.10,<1.11"
-before_install:
-  - sudo /etc/init.d/postgresql stop
-  - sudo apt-get -y remove --purge postgresql-9.1
-  - sudo apt-get -y remove --purge postgresql-9.2
-  - sudo apt-get -y remove --purge postgresql-9.3
-  - sudo apt-get -y remove --purge postgresql-9.4
-  - sudo apt-get -y autoremove
-  - sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8
-  - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main 9.5" >> /etc/apt/sources.list.d/postgresql.list'
-  - sudo apt-get update
-  - sudo apt-get -y install postgresql-9.5
-  - sudo sh -c 'echo "local all postgres trust" > /etc/postgresql/9.5/main/pg_hba.conf'
-  - sudo sh -c 'echo -n "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.5/main/pg_hba.conf'
-  - sudo /etc/init.d/postgresql restart
-  - psql --version
+    - DJANGO=">=1.11,<2.0"
+addons:
+  postgresql: '9.5'
 install:
   - pip install -q coverage coveralls flake8 Django$DJANGO django-nose>=1.4
 before_script:

docs/release_notes.rst

@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+v0.15.0
+-------
+* Handle custom db column names
+* Drop Django 1.8
+* Support Django 1.10
+* Support Django 1.11
+* Support Python 3.6
+
 v0.14.3
 -------
 * Respect return_models in upsert method when building upsert sql

querybuilder/query.py

@@ -176,7 +176,7 @@ def set_right_table(self, table):
                     field.get_internal_type() == 'OneToOneField' or
                     field.get_internal_type() == 'ForeignKey'
                 ):
-                    if field.rel.to == self.right_table.model:
+                    if field.remote_field.model == self.right_table.model:
                         if self.right_table.field_prefix is None:
                             self.right_table.field_prefix = field.name
                         return
@@ -216,7 +216,7 @@ def get_condition(self):
                     field.get_internal_type() == 'OneToOneField' or
                     field.get_internal_type() == 'ForeignKey'
                 ):
-                    if field.rel.to == self.left_table.model:
+                    if field.remote_field.model == self.left_table.model:
                         table_join_field = field.column
                         # self.table_join_name = field.name
                         condition = '{0}.{1} = {2}.{3}'.format(
@@ -1237,7 +1237,8 @@ def get_upsert_sql(
             placeholders = []
             for field in all_fields:
                 # Convert field value to db value
-                sql_args.append(field.get_db_prep_save(getattr(row, field.column), self.connection))
+                # Use attname here to support fields with custom db_column names
+                sql_args.append(field.get_db_prep_save(getattr(row, field.attname), self.connection))
                 placeholders.append('%s')
             row_values.append('({0})'.format(', '.join(placeholders)))
         row_values_sql = ', '.join(row_values)

querybuilder/tests/migrations/0001_initial.py

@@ -64,6 +64,7 @@ class Migration(migrations.Migration):
                 ('field6', models.CharField(max_length=16)),
                 ('field7', models.CharField(max_length=16)),
                 ('field8', json_field),
+                ('custom_field_name', models.CharField(max_length=16, null=True, default='foo', db_column='actual_db_column_name')),
             ],
         ),
         migrations.CreateModel(

querybuilder/tests/models.py

@@ -16,7 +16,7 @@ class Account(models.Model):
     """
     Account model
     """
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
     first_name = models.CharField(max_length=64)
     last_name = models.CharField(max_length=64)
 
@@ -25,7 +25,7 @@ class Order(models.Model):
     """
     Order model
     """
-    account = models.ForeignKey(Account)
+    account = models.ForeignKey(Account, on_delete=models.CASCADE)
     revenue = models.FloatField(null=True)
     margin = models.FloatField()
     margin_percent = models.FloatField()
@@ -52,6 +52,9 @@ class Uniques(models.Model):
     field6 = models.CharField(max_length=16)
     field7 = models.CharField(max_length=16)
     field8 = JSONField(default={})
+    custom_field_name = models.CharField(
+        max_length=16, null=True, default='foo', db_column='actual_db_column_name'
+    )
 
     class Meta:
         unique_together = ('field6', 'field7')

querybuilder/tests/upsert_tests.py

@@ -216,3 +216,34 @@ def test_upsert_pk_return_models(self):
         self.assertEqual(users[0].email, 'user1change')
         self.assertEqual(users[1].email, 'user2')
         self.assertEqual(users[2].email, 'user3')
+
+    def test_upsert_custom_db_column(self):
+        """
+        Makes sure upserting a model containing a field with a custom db_column name works.
+        """
+
+        model = Uniques(field1='1', custom_field_name='test')
+
+        Query().from_table(Uniques).upsert(
+            [model],
+            unique_fields=['field1'],
+            update_fields=[]
+        )
+
+        saved_model = Uniques.objects.get()
+
+        self.assertEqual(saved_model.custom_field_name, 'test')
+
+        saved_model.custom_field_name = 'edited'
+
+        Query().from_table(Uniques).upsert(
+            [saved_model],
+            unique_fields=['field1'],
+            update_fields=['custom_field_name']
+        )
+
+        updated_model = Uniques.objects.get()
+        self.assertEqual(updated_model.custom_field_name, 'edited')
+
+        rows = Query().from_table(Uniques).select()
+        self.assertEqual(rows[0]['actual_db_column_name'], 'edited')

querybuilder/version.py

@@ -1 +1 @@
-__version__ = '0.14.3'
+__version__ = '0.15.0'

setup.py

@@ -32,28 +32,29 @@ def get_version():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Development Status :: 5 - Production/Stable',
     ],
     license='MIT',
     install_requires=[
-        'django>=1.8',
+        'Django>=1.9',
         'pytz>=2015.6',
         'fleming>=0.4.4',
         'six',
     ],
     tests_require=[
         'psycopg2',
         'django-nose>=1.4',
-        'django-dynamic-fixture==1.8.5',
+        'django-dynamic-fixture',
         'jsonfield==0.9.20',
-        'mock==1.0.1'
+        'mock'
     ],
     test_suite='run_tests.run_tests',
     include_package_data=True,