Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/inline_formsets/models.py b/tests/inline_formsets/models.py
new file mode 100644
index 0000000000..40c85fe739
--- /dev/null
+++ b/tests/inline_formsets/models.py
@@ -0,0 +1,31 @@
+# coding: utf-8
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+
+
+class School(models.Model):
+    name = models.CharField(max_length=100)
+
+class Parent(models.Model):
+    name = models.CharField(max_length=100)
+
+class Child(models.Model):
+    mother = models.ForeignKey(Parent, related_name='mothers_children')
+    father = models.ForeignKey(Parent, related_name='fathers_children')
+    school = models.ForeignKey(School)
+    name = models.CharField(max_length=100)
+
+@python_2_unicode_compatible
+class Poet(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name
+
+@python_2_unicode_compatible
+class Poem(models.Model):
+    poet = models.ForeignKey(Poet)
+    name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.name