passes test in Django 2 and 1.8

Author: postfalk

.travis.yml

@@ -10,6 +10,12 @@ env:
  - DJANGO_VERSION=1.9.11
  - DJANGO_VERSION=1.10.3
  - DJANGO_VERSION=1.11.6
+ - DJANGO_VERSION=2.0.1
+
+matrix:
+  exclude:
+    - python: '2.7'
+      env: DJANGO_VERSION=2.0.1
 
 before_install:
   - lsb_release -a

etl_sync/generators.py

@@ -252,8 +252,9 @@ def prepare_field(self, field, value):
 
     def prepare_fk(self, field, value):
         options = {'related_field': field.related_fields[0][1].name}
+        related = getattr(field, 'related_model')
         return InstanceGenerator(
-            field.rel.to, options=options).get_instance(value)
+            related, options=options).get_instance(value)
 
     def prepare_m2m(self, field, lst):
         """
@@ -264,7 +265,8 @@ def prepare_m2m(self, field, lst):
         if not isinstance(lst, list):
             lst = [lst]
         for item in lst:
-            generator = InstanceGenerator(field.rel.to)
+            related = getattr(field, 'related_model')
+            generator = InstanceGenerator(related)
             instance = generator.get_instance(item)
             self.related_instances[field.name].append(instance)
 

runtests.py

@@ -13,6 +13,8 @@
 
 
 tests = 'tests'
+
+
 try:
     tests = sys.argv[1]
 except IndexError:
@@ -23,9 +25,10 @@
     os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
     try:
         django.setup()
-    except AttributeError:
-        pass
-    TestRunner = get_runner(settings)
-    test_runner = TestRunner()
-    failures = test_runner.run_tests([tests])
-    sys.exit(bool(failures))
+    except AttributeError as e:
+        print("Django setup did not work\n\n", e)
+    else:
+        TestRunner = get_runner(settings)
+        test_runner = TestRunner()
+        failures = test_runner.run_tests([tests])
+        sys.exit(bool(failures))

tests/models.py

@@ -19,7 +19,7 @@ class Nombre(models.Model):
 
 
 class SimpleFkModel(models.Model):
-    fk = models.ForeignKey(Nombre)
+    fk = models.ForeignKey(Nombre, on_delete=models.CASCADE)
     name = models.CharField(max_length=10)
 
 
@@ -57,10 +57,11 @@ class TestModel(models.Model):
     record = models.CharField(max_length=10, unique=True)
     name = models.CharField(max_length=10, null=True, blank=True)
     zahl = models.CharField(max_length=10, null=True, blank=True)
-    nombre = models.ForeignKey(Nombre, null=True)
-    numero = models.ForeignKey(Numero)
+    nombre = models.ForeignKey(Nombre, null=True, on_delete=models.CASCADE)
+    numero = models.ForeignKey(Numero, on_delete=models.CASCADE)
     elnumero = models.ForeignKey(
-        ElNumero, to_field='rec', null=True, blank=True)
+        ElNumero, to_field='rec', null=True, blank=True,
+        on_delete=models.CASCADE)
     related = models.ManyToManyField(Polish, blank=True)
     date = models.DateTimeField(null=True, blank=True)
 
@@ -72,17 +73,20 @@ class TestOnetoOneModel(models.Model):
     record = models.CharField(max_length=10, unique=True)
     name = models.CharField(max_length=10, null=True, blank=True)
     zahl = models.CharField(max_length=10, null=True, blank=True)
-    nombre = models.OneToOneField(Nombre, null=True, blank=True)
-    numero = models.ForeignKey(Numero)
+    nombre = models.OneToOneField(
+        Nombre, null=True, blank=True, on_delete=models.CASCADE)
+    numero = models.ForeignKey(Numero, on_delete=models.CASCADE)
     elnumero = models.ForeignKey(
-        ElNumero, to_field='rec', null=True, blank=True)
+        ElNumero, to_field='rec', null=True, blank=True,
+        on_delete=models.CASCADE)
     related = models.ManyToManyField(Polish, blank=True)
     date = models.DateTimeField(null=True, blank=True)
 
 
 class HashTestModel(models.Model):
     record = models.CharField(max_length=10, unique=True)
-    numero = models.ForeignKey(Numero, null=True, blank=True)
+    numero = models.ForeignKey(
+        Numero, null=True, blank=True, on_delete=models.CASCADE)
     zahl = models.CharField(max_length=10, null=True, blank=True)
     related = models.ManyToManyField(Polish)
     md5 = models.CharField(max_length=32, null=True)
@@ -101,16 +105,16 @@ class SomeModel(models.Model):
 
 
 class IntermediateModel(models.Model):
-    somemodel = models.ForeignKey(SomeModel)
-    anothermodel = models.ForeignKey(AnotherModel)
+    somemodel = models.ForeignKey(SomeModel, on_delete=models.CASCADE)
+    anothermodel = models.ForeignKey(AnotherModel, on_delete=models.CASCADE)
     attribute = models.CharField(max_length=10, blank=True)
 
 
 class GeometryModel(models.Model):
     name = models.CharField(max_length=10, null=True, blank=True)
     geom2d = models.GeometryField(null=True, blank=True)
     geom3d = models.GeometryField(null=True, blank=True, dim=3)
-    objects = models.GeoManager()
+    # objects = models.GeoManager()
 
 
 class DateTimeModel(models.Model):
@@ -127,7 +131,8 @@ class Meta:
 
 
 class ParentModel(models.Model):
-    well_defined = models.ForeignKey(WellDefinedModel)
+    well_defined = models.ForeignKey(
+        WellDefinedModel, on_delete=models.CASCADE)
 
 
 class TwoUnique(models.Model):
@@ -136,13 +141,13 @@ class TwoUnique(models.Model):
 
 
 class TwoRelatedAsUnique(models.Model):
-    numero = models.ForeignKey(Numero)
-    another = models.ForeignKey(AnotherModel)
+    numero = models.ForeignKey(Numero, on_delete=models.CASCADE)
+    another = models.ForeignKey(AnotherModel, on_delete=models.CASCADE)
     value = models.CharField(max_length=5)
 
     class Meta:
         unique_together = ('numero', 'another')
 
 class RelatedRelated(models.Model):
-    key = models.ForeignKey(TwoRelatedAsUnique)
+    key = models.ForeignKey(TwoRelatedAsUnique, on_delete=models.CASCADE)
     value = models.CharField(max_length=5)