Ticket #15519: patch-15519.diff

django/core/management/sql.py

@@ -147 +147 @@
 
 def custom_sql_for_model(model, style, connection):
     opts = model._meta
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
+
+    app = models.get_app(model._meta.app_label)
+    app_dirs = []
+    if hasattr(app, '__path__'):
+        # It's a 'models/' subpackage
+        for path in app.__path__:
+            path = os.path.normpath(os.path.join(path, 'sql'))
+            app_dirs.append(path)
+    else:
+        # It's a models.py module
+        app_dirs.append(os.path.normpath(os.path.join(os.path.dirname(app.__file__))))
+
     output = []
 
     # Post-creation SQL should come before any initial SQL data is loaded.
@@ -164 +175 @@
 
     # Find custom SQL, if it's available.
     backend_name = connection.settings_dict['ENGINE'].split('.')[-1]
-    sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), backend_name)),
-                 os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
+    sql_files = []
+    for app_dir in app_dirs:
+        sql_files.append(os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), backend_name)))
+        sql_files.append(os.path.join(app_dir, "%s.sql" % opts.object_name.lower()))
     for sql_file in sql_files:
         if os.path.exists(sql_file):
             fp = open(sql_file, 'U')