Merge branch 'azure-1.11' into azure-2.0

michiya · michiya · commit 95725cbf9e01 · 2018-06-12T10:52:04.000+09:00
diff --git a/sql_server/pyodbc/schema.py b/sql_server/pyodbc/schema.py
@@ -2,7 +2,7 @@
 import datetime
 
 from django.db.backends.base.schema import (
-    BaseDatabaseSchemaEditor, logger, _related_non_m2m_objects,
+    BaseDatabaseSchemaEditor, logger, _is_relevant_relation, _related_non_m2m_objects,
 )
 from django.db.backends.ddl_references import (
     Statement,

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`import datetime`
`3`	`3`
`4`	`4`	`from django.db.backends.base.schema import (`
`5`		`- BaseDatabaseSchemaEditor, logger, _related_non_m2m_objects,`
	`5`	`+ BaseDatabaseSchemaEditor, logger, _is_relevant_relation, _related_non_m2m_objects,`
`6`	`6`	`)`
`7`	`7`	`from django.db.backends.ddl_references import (`
`8`	`8`	`Statement,`