From 9071117ea2cd931591d10333f989381db4aacec6 Mon Sep 17 00:00:00 2001
From: Douglas Hall <douglas_hall@icloud.com>
Date: Thu, 4 Jan 2018 16:57:52 -0500
Subject: [PATCH] Revert "Revert "ENT-779 Remove
 ProviderConfig.drop_existing_session field from DB.""

This reverts commit 23e17b3c35d96853c35be17cf8589d885c1dc6b2.
---
 .../migrations/0014_auto_20171222_1233.py     | 26 +++++++++++++++++++
 common/djangoapps/util/tests/test_db.py       |  8 +-----
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 common/djangoapps/third_party_auth/migrations/0014_auto_20171222_1233.py

diff --git a/common/djangoapps/third_party_auth/migrations/0014_auto_20171222_1233.py b/common/djangoapps/third_party_auth/migrations/0014_auto_20171222_1233.py
new file mode 100644
index 0000000000..f06a72d104
--- /dev/null
+++ b/common/djangoapps/third_party_auth/migrations/0014_auto_20171222_1233.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('third_party_auth', '0013_sync_learner_profile_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ltiproviderconfig',
+            name='drop_existing_session',
+        ),
+        migrations.RemoveField(
+            model_name='oauth2providerconfig',
+            name='drop_existing_session',
+        ),
+        migrations.RemoveField(
+            model_name='samlproviderconfig',
+            name='drop_existing_session',
+        ),
+    ]
diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py
index 3a2ed47bb2..2509d22052 100644
--- a/common/djangoapps/util/tests/test_db.py
+++ b/common/djangoapps/util/tests/test_db.py
@@ -237,10 +237,4 @@ class MigrationTests(TestCase):
         out = StringIO()
         call_command('makemigrations', dry_run=True, verbosity=3, stdout=out)
         output = out.getvalue()
-        # Temporarily disable this check so we can remove
-        # the ProviderConfig.drop_existing_session field.
-        # We will restore this check once the code referencing
-        # this field has been deleted/released and a migration
-        # for field removal has been added.
-        if 'Remove field' not in output:
-            self.assertIn('No changes detected', output)
+        self.assertIn('No changes detected', output)