From 364098fdac597d2293d844d81ab523c22ca5a361 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Tue, 4 May 2021 17:49:46 -0400
Subject: [PATCH] [3.2.x] Fixed #32714 -- Prevented recreation of migration for
 Meta.ordering with OrderBy expressions.

Regression in c8b659430556dca0b2fe27cf2ea0f8290dbafecd.

Thanks Kevin Marsh for the report.

Backport of 96f55ccf798c7592a1203f798a4dffaf173a9263 from main
---
 django/db/models/expressions.py |  3 +--
 docs/releases/3.2.2.txt         |  4 +++-
 tests/expressions/tests.py      | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index d945e57f067e5..08ee5fe18bff8 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -1174,8 +1174,7 @@ def select_format(self, compiler, sql, params):
         return sql, params
 
 
-@deconstructible
-class OrderBy(BaseExpression):
+class OrderBy(Expression):
     template = '%(expression)s %(ordering)s'
     conditional = False
 
diff --git a/docs/releases/3.2.2.txt b/docs/releases/3.2.2.txt
index 47a541add0af6..d47da08d6c159 100644
--- a/docs/releases/3.2.2.txt
+++ b/docs/releases/3.2.2.txt
@@ -9,4 +9,6 @@ Django 3.2.2 fixes several bugs in 3.2.1.
 Bugfixes
 ========
 
-* ...
+* Prevented, following a regression in Django 3.2.1, :djadmin:`makemigrations`
+  from generating infinite migrations for a model with ``Meta.ordering``
+  contained ``OrderBy`` expressions (:ticket:`32714`).
diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py
index 9a34242de76b3..bea7633a49e4a 100644
--- a/tests/expressions/tests.py
+++ b/tests/expressions/tests.py
@@ -1947,3 +1947,25 @@ def test_non_empty_group_by(self):
         group_by_cols = expr.get_group_by_cols(alias=None)
         self.assertEqual(group_by_cols, [expr.expression])
         self.assertEqual(group_by_cols[0].output_field, expr.output_field)
+
+
+class OrderByTests(SimpleTestCase):
+    def test_equal(self):
+        self.assertEqual(
+            OrderBy(F('field'), nulls_last=True),
+            OrderBy(F('field'), nulls_last=True),
+        )
+        self.assertNotEqual(
+            OrderBy(F('field'), nulls_last=True),
+            OrderBy(F('field'), nulls_last=False),
+        )
+
+    def test_hash(self):
+        self.assertEqual(
+            hash(OrderBy(F('field'), nulls_last=True)),
+            hash(OrderBy(F('field'), nulls_last=True)),
+        )
+        self.assertNotEqual(
+            hash(OrderBy(F('field'), nulls_last=True)),
+            hash(OrderBy(F('field'), nulls_last=False)),
+        )