Fix autonumbering locking with SQL named locks and Django row locking

specifyweb/frontend/js_src/lib/components/Interactions/InteractionDialog.tsx

@@ -80,7 +80,8 @@ export function InteractionDialog({
   );
 
   const isLoanReturnLike =
-    isLoanReturn || (actionTable.name !== 'Loan' && actionTable.name.includes('Loan'));
+    isLoanReturn ||
+    (actionTable.name !== 'Loan' && actionTable.name.includes('Loan'));
 
   const itemTable = isLoanReturnLike ? tables.Loan : tables.CollectionObject;
 
@@ -206,8 +207,7 @@ export function InteractionDialog({
             )
         ).then((data) =>
           availablePrepsReady(catalogNumbers, data, {
-            skipEntryMatch:
-              searchField.name.toLowerCase() !== 'catalognumber',
+            skipEntryMatch: searchField.name.toLowerCase() !== 'catalognumber',
           })
         )
       );
@@ -377,7 +377,9 @@ export function InteractionDialog({
             values,
             isLoan
           )
-      ).then((data) => availablePrepsReady(values, data, { skipEntryMatch: true }))
+      ).then((data) =>
+        availablePrepsReady(values, data, { skipEntryMatch: true })
+      )
     );
   }
 

specifyweb/specify/migrations/0001_initial.py

@@ -5762,6 +5762,36 @@ class Migration(migrations.Migration):
                 'ordering': (),
             },
         ),
+        migrations.CreateModel(
+            name='AutonumschColl',
+            fields=[
+                ('collectionid', models.ForeignKey(db_column='CollectionID', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='specify.collection')),
+            ],
+            options={
+                'db_table': 'autonumsch_coll',
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AutonumschDiv',
+            fields=[
+                ('divisionid', models.ForeignKey(db_column='DivisionID', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='specify.division')),
+            ],
+            options={
+                'db_table': 'autonumsch_div',
+                'managed': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='AutonumschDsp',
+            fields=[
+                ('disciplineid', models.ForeignKey(db_column='DisciplineID', on_delete=django.db.models.deletion.DO_NOTHING, primary_key=True, serialize=False, to='specify.discipline')),
+            ],
+            options={
+                'db_table': 'autonumsch_dsp',
+                'managed': False,
+            },
+        ),
         migrations.CreateModel(
             name='Author',
             fields=[

specifyweb/specify/migrations/0043_add_indexes_to_help_autonumbering.py

@@ -0,0 +1,145 @@
+from django.db import migrations, models
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('specify', '0042_discipline_type_picklist'),
+    ]
+
+    operations = [
+        # accession, accessionnumber, division
+        migrations.AddIndex(
+            model_name='accession',
+            index=models.Index(fields=['division_id', 'accessionnumber'], name='DivAccessionNumberIDX'),
+        ),
+        # collectionobject, catalognumber, collection
+        migrations.AddIndex(
+            model_name='collectionobject',
+            index=models.Index(fields=['collectionmemberid', 'catalognumber'], name='ColCatalogNumberIDX'),
+        ),
+        # loan, discipline, loannumber
+        migrations.AddIndex(
+            model_name='loan',
+            index=models.Index(fields=['discipline', 'loannumber'], name='DispLoanNumberIDX'),
+        ),
+
+        # borrow, invoicenumber, null
+        # migrations.AddIndex(
+        #     model_name='borrow',
+        #     index=models.Index(fields=['invoicenumber'], name='BorrowInvoiceNumberIDX'),
+        # ),
+
+        # exchangein, exchangeinnumber, division
+        migrations.AddIndex(
+            model_name='exchangein',
+            index=models.Index(fields=['division', 'exchangeinnumber'], name='DivExcInNumberIDX'),
+        ),
+
+        # exchangeout, exchangeoutnumber, division
+        migrations.AddIndex(
+            model_name='exchangeout',
+            index=models.Index(fields=['division', 'exchangeoutnumber'], name='DivExcOutNumberIDX'),
+        ),
+
+        # collectingevent, stationfieldnumber, discipline
+        migrations.AddIndex(
+            model_name='collectingevent',
+            index=models.Index(fields=['discipline', 'stationfieldnumber'], name='DispStationFieldNumIDX'),
+        ),
+
+        # collection, regnumber, discipline
+        migrations.AddIndex(
+            model_name='collection',
+            index=models.Index(fields=['discipline', 'regnumber'], name='DispColRegNumberIDX'),
+        ),
+
+        # collector, ordernumber, division
+        migrations.AddIndex(
+            model_name='collector',
+            index=models.Index(fields=['division', 'ordernumber'], name='DivCollectorOrderNumIDX'),
+        ),
+
+        # discipline, regnumber, division
+        migrations.AddIndex(
+            model_name='discipline',
+            index=models.Index(fields=['division', 'regnumber'], name='DivDispRegNumberIDX'),
+        ),
+
+        # disposal, disposalnumber, null
+        # migrations.AddIndex(
+        #     model_name='disposal',
+        #     index=models.Index(fields=['disposalnumber'], name='DisposalNumberIDX'),
+        # ),
+
+        # division, regnumber, institution
+        migrations.AddIndex(
+            model_name='division',
+            index=models.Index(fields=['institution', 'regnumber'], name='InstDivRegNumberIDX'),
+        ),
+
+        # exsiccataitem, number, null
+        migrations.AddIndex(
+            model_name='exsiccataitem',
+            index=models.Index(fields=['number'], name='ExsiccataItemNumberIDX'),
+        ),
+
+        # fieldnotebookpage, pagenumber, discipline
+        migrations.AddIndex(
+            model_name='fieldnotebookpage',
+            index=models.Index(fields=['discipline', 'pagenumber'], name='DispFNBPageNumIDX'),
+        ),
+
+        # fieldnotebookpageset, ordernumber, discipline
+        migrations.AddIndex(
+            model_name='fieldnotebookpageset',
+            index=models.Index(fields=['discipline', 'ordernumber'], name='DispFNBPageSetNumIDX'),
+        ),
+
+        # fundingagent, ordernumber, division
+        migrations.AddIndex(
+            model_name='fundingagent',
+            index=models.Index(fields=['division', 'ordernumber'], name='DivFundingAgentOrderNumIDX'),
+        ),
+
+        # gift, giftnumber, discipline
+        migrations.AddIndex(
+            model_name='gift',
+            index=models.Index(fields=['discipline', 'giftnumber'], name='DispGiftNumberIDX'),
+        ),
+
+        # groupperson, ordernumber, division
+        migrations.AddIndex(
+            model_name='groupperson',
+            index=models.Index(fields=['division', 'ordernumber'], name='DivGroupPersonOrderNumIDX'),
+        ),
+
+        # permit, permitnumber, institution
+        migrations.AddIndex(
+            model_name='permit',
+            index=models.Index(fields=['institution', 'permitnumber'], name='InstPermitNumberIDX'),
+        ),
+
+        # referencework, librarynumber, institution
+        migrations.AddIndex(
+            model_name='referencework',
+            index=models.Index(fields=['institution', 'librarynumber'], name='InstRefWorkLibNumIDX'),
+        ),
+
+        # repositoryagreement, repositoryagreementnumber, division
+        migrations.AddIndex(
+            model_name='repositoryagreement',
+            index=models.Index(fields=['division', 'repositoryagreementnumber'], name='DivRepoAgreeNumIDX'),
+        ),
+
+        # shipment, shipmentnumber, discipline
+        migrations.AddIndex(
+            model_name='shipment',
+            index=models.Index(fields=['discipline', 'shipmentnumber'], name='DispShipmentNumberIDX'),
+        ),
+
+        # treatmentevent, treatmentnumber, division
+        migrations.AddIndex(
+            model_name='treatmentevent',
+            index=models.Index(fields=['division', 'treatmentnumber'], name='DivTreatmentNumberIDX'),
+        ),
+    ]