Merge pull request #68 from SoprisApps/renamed-column-fixes

Renamed column fixes

Author: Photonios

psqlextra/manager/manager.py

@@ -218,20 +218,20 @@ def insert_and_get(self, **fields):
 
         columns = rows[0]
 
-        # get a list of columns that are officially part of the model
-        model_columns = [
-            field.column
-            for field in self.model._meta.local_concrete_fields
-        ]
+        # get a list of columns that are officially part of the model and preserve the fact that the attribute name
+        # might be different than the database column name
+        model_columns = {}
+        for field in self.model._meta.local_concrete_fields:
+            model_columns[field.column] = field.attname
 
         # strip out any columns/fields returned by the db that
         # are not present in the model
         model_init_fields = {}
         for column_name, column_value in columns.items():
-            if column_name not in model_columns:
-                continue
-
-            model_init_fields[column_name] = column_value
+            try:
+                model_init_fields[model_columns[column_name]] = column_value
+            except KeyError:
+                pass
 
         return self.model(**model_init_fields)
 

tests/test_insert.py

@@ -98,3 +98,27 @@ def test_insert_on_conflict_explicit_pk():
     assert obj1.pk == 'the-object'
     assert obj1.name == 'the-object'
     assert obj1.cookies == 'some-cookies'
+
+
+def test_insert_with_different_column_name():
+    """Tests whether inserts works when the primary key is explicitly specified."""
+
+    model = get_fake_model({
+        'name': models.CharField(max_length=255, primary_key=True),
+        'cookies': models.CharField(max_length=255, null=True, db_column='brownies'),
+    })
+
+    cookie_string = 'these-are-brownies'
+
+    results = model.objects \
+        .on_conflict(['name'], ConflictAction.NOTHING) \
+        .insert_and_get(
+            name='the-object',
+            cookies=cookie_string
+        )
+
+    assert results is not None
+    assert results.cookies == cookie_string
+
+    obj1 = model.objects.get()
+    assert obj1.cookies == cookie_string

tox.ini

@@ -9,4 +9,4 @@ deps =
 setenv =
     DJANGO_SETTINGS_MODULE=settings
 passenv = DATABASE_URL
-commands = python -m pytest --cov=psqlextra
+commands = python -m pytest --cov=psqlextra --cov-report=term-missing