Removed support for custom SQL per deprecation timeline.

4 files changed, 0 insertions, 26 deletions

diff --git a/tests/fixtures_model_package/models/__init__.py b/tests/fixtures_model_package/models/__init__.py
index c48cfd451d..63d73f83f9 100644
--- a/tests/fixtures_model_package/models/__init__.py
+++ b/tests/fixtures_model_package/models/__init__.py
@@ -13,10 +13,3 @@ class Article(models.Model):
     class Meta:
         app_label = 'fixtures_model_package'
         ordering = ('-pub_date', 'headline')
-
-
-class Book(models.Model):
-    name = models.CharField(max_length=100)
-
-    class Meta:
-        ordering = ('name',)
diff --git a/tests/fixtures_model_package/models/sql/book.sql b/tests/fixtures_model_package/models/sql/book.sql
deleted file mode 100644
index 9b3918f4d7..0000000000
--- a/tests/fixtures_model_package/models/sql/book.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Deprecated search path for custom SQL -- remove in Django 1.9
-INSERT INTO fixtures_model_package_book (name) VALUES ('My Deprecated Book');
diff --git a/tests/fixtures_model_package/sql/book.sql b/tests/fixtures_model_package/sql/book.sql
deleted file mode 100644
index 21b1d9465b..0000000000
--- a/tests/fixtures_model_package/sql/book.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO fixtures_model_package_book (name) VALUES ('My Book');
diff --git a/tests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py
index 431bf8fa47..ef5adb3de8 100644
--- a/tests/fixtures_model_package/tests.py
+++ b/tests/fixtures_model_package/tests.py
@@ -4,7 +4,6 @@ import warnings
 
 from django.core import management
 from django.test import TestCase
-from django.utils.six import StringIO
 
 from .models import Article
 
@@ -66,18 +65,3 @@ class FixtureTestCase(TestCase):
             ],
             lambda a: a.headline,
         )
-
-
-class InitialSQLTests(TestCase):
-
-    def test_custom_sql(self):
-        """
-        #14300 -- Verify that custom_sql_for_model searches `app/sql` and not
-        `app/models/sql` (the old location will work until Django 1.9)
-        """
-        out = StringIO()
-        management.call_command("sqlcustom", "fixtures_model_package", stdout=out)
-        output = out.getvalue()
-        self.assertIn("INSERT INTO fixtures_model_package_book (name) VALUES ('My Book')", output)
-        # value from deprecated search path models/sql (remove in Django 1.9)
-        self.assertIn("Deprecated Book", output)