Add offset clause for all Django versions (microsoft#117)

Issue microsoft#109, missing OFFSET clause causes select_for_update() to fail

Author: absci

mssql/compiler.py

@@ -319,7 +319,9 @@ def as_sql(self, with_limits=True, with_col_aliases=False):
                 # For subqueres with an ORDER BY clause, SQL Server also
                 # requires a TOP or OFFSET clause which is not generated for
                 # Django 2.x.  See https://github.com/microsoft/mssql-django/issues/12
-                if django.VERSION < (3, 0, 0) and not (do_offset or do_limit):
+                # Add OFFSET for all Django versions.
+                # https://github.com/microsoft/mssql-django/issues/109
+                if not (do_offset or do_limit):
                     result.append("OFFSET 0 ROWS")
 
             # SQL Server requires the backend-specific emulation (2008 or earlier)

testapp/migrations/0019_customer_name_customer_address.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.0.3 on 2022-03-24 14:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('testapp', '0018_choice_question'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Customer_name',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('Customer_name', models.CharField(max_length=100)),
+            ],
+            options={
+                'ordering': ['Customer_name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Customer_address',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('Customer_address', models.CharField(max_length=100)),
+                ('Customer_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='testapp.customer_name')),
+            ],
+            options={
+                'ordering': ['Customer_address'],
+            },
+        ),
+    ]

testapp/models.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the BSD license.
 
+import datetime
 import uuid
 
 from django import VERSION
@@ -200,3 +201,15 @@ class Choice(models.Model):
 
     class Meta:
         unique_together = (('question', 'choice_text'))
+
+
+class Customer_name(models.Model):
+    Customer_name = models.CharField(max_length=100)
+    class Meta:
+        ordering = ['Customer_name']
+
+class Customer_address(models.Model):
+    Customer_name = models.ForeignKey(Customer_name, on_delete=models.CASCADE)
+    Customer_address = models.CharField(max_length=100)
+    class Meta:
+        ordering = ['Customer_address']

testapp/tests/test_fields.py

@@ -3,9 +3,20 @@
 
 from django.test import TestCase
 
-from ..models import UUIDModel
+from ..models import UUIDModel, Customer_name, Customer_address
 
 
 class TestUUIDField(TestCase):
     def test_create(self):
         UUIDModel.objects.create()
+
+
+class TestOrderBy(TestCase):
+    def test_order_by(self):
+        # Issue 109
+        # Sample: https://github.com/jwaschkau/django-mssql-issue109
+        john = Customer_name.objects.create(Customer_name='John')
+        Customer_address.objects.create(Customer_address='123 Main St', Customer_name=john)
+        names = Customer_name.objects.select_for_update().all()
+        addresses = Customer_address.objects.filter(Customer_address='123 Main St', Customer_name__in=names)
+        self.assertEqual(len(addresses), 1)