Bring changes from `v7.11.4` to `main` #7683

melton-jason · 2026-02-04T19:34:31Z

Brings the changes from #7671 / v7.11.4 to main.

Checklist

Self-review the PR after opening it to make sure the changes look good and
self-explanatory (or properly documented)
Add relevant issue to release milestone
Add pr to documentation list
Add automated tests

Testing instructions

Follow the testing instructions from Prevent broken transactions when autonumbering (#7671) (provided below) and ensure the functionality is correct with the updated branch:

Sample Database

To speed up setup for testing this Pull Request, i've set up a testing database that contains all resources required for testing:
Feel free to use the database!

User - spadmin
Password - testuser

Collections:

Fish

In the SCC Division

In the Ichthyology Discipline

Catalog Number of the format FSH-#########

One CollectionObject WorkBench Data Set

One Accession WorkBench Data Set

Plants

In the SCC Division

In the Botany Discipline

Catalog Number of the format #########

CO -> text2 of the format AAA-NNN-#########

Where A can be any letter and N can be any number

Locality -> text1 of the format #########

Two Collection Object WorkBench Data Sets

One Locality Data Set

Vascular Plants

In the SCC Division

In the Botany Discipline

CO -> text2 of the format AAA-NNN-#########

Where A can be any letter and N can be any number

Locality -> text1 of the format #########

One Collection Object WorkBench Data Set

Mammals

In the Test Division

In the Mammology Discipline

One Accession WorkBench Data Set

Where Accessions are scoped to Division:

issue-6490_scoped_accession_testing.sql.zip

Where Accessions are globally scoped:

issue-6490_global_accession_testing.sql.zip

General Concurrency with WorkBench

Start a WorkBench Upload or Validation operation on a sufficiently large Data Set (the operation needs to be in process while the below steps of General Concurrency are completed)
Open Specify in a new tab, window, or browser
Open a DataEntry form of the same table as the base table as the WorkBench Data Set, where one or fields have an autonumbering field format
Save the Data Entry record and ensure the record saves successfully
Reload the page and ensure Specify loads and still remains accessible

Concurrent Autonumbering with the WorkBench

Start a WorkBench Upload operation on a sufficiently large Data Set (the operation needs to be in process while some of the below steps of Concurrent Autonumbering with the WorkBench are completed) that contains two or more fields that will be autonumbered
Open Specify in a new tab, window, or browser
Open a DataEntry form of the same table as the base table as the WorkBench Data Set, where one or fields have an autonumbering field format
Save the Data Entry record and ensure the record saves successfully
Wait for the WorkBench Upload operation to complete
Ensure that the value for the autonumbered field from Data Entry is skipped in the WorkBench upload results.

Concurrent Autonumbering with Non Collection Scoping
Review Table Scoping Hiearchy for an overview on table scopes

With the Sample Database, this would be using the Locality Data Set in the Plants Collection with creating a new Locality in the Vascular Plants Collection

Start a WorkBench Upload operation on a sufficiently large Data Set (the operation needs to be in process while some of the below steps of Concurrent Autonumbering with Non Collection Scoping are completed) where the base table is not scoped to Collection that contains one or more fields that will be autonumbered
Open Specify in a new tab, window, or browser
Switch to a different Collection which is in the same scope as the records being uploaded
Open a DataEntry form of the same table as the base table as the WorkBench Data Set where one or more fields have an autonumbering field format
Save the Data Entry record and ensure the record saves successfully
Wait for the WorkBench Upload operation to complete
Ensure that the value for the autonumbered field from Data Entry is skipped in the WorkBench upload results.

Autonumbering with Variable Table Scoping

In a database with more than one Division where Accessions are scoped to Division

Start a WorkBench Upload operation on a sufficiently large Accession Data Set (the operation needs to be in process while some of the below steps of Concurrent Autonumbering with Non Collection Scoping are completed) where a field on Accession is being autonumbered
Open Specify in a new tab, window, or browser
Switch to a different Collection which is in a different Division as the records being uploaded
Open an Accession DataEntry form
Save the Accession and ensure the record saves successfully
Wait for the WorkBench Upload operation to complete
Ensure that the Accessions in different Divisions are independently auto-numbered (e.g., Accessions in different Divisions should not share the same autonumbering)

In a database with more than one Division where Accessions are globally scoped

Start a WorkBench Upload operation on a sufficiently large Accession Data Set (the operation needs to be in process while some of the below steps of Concurrent Autonumbering with Non Collection Scoping are completed) where a field on Accession is being autonumbered
Open Specify in a new tab, window, or browser
Switch to a different Collection which is in a different Division as the records being uploaded
Open an Accession DataEntry form
Save the Accession and ensure the record saves successfully
Wait for the WorkBench Upload operation to complete
Ensure that the value for the autonumbered field from Data Entry is skipped in the WorkBench upload results in the other Division
Generally ensure that autonumbering respects the scoping of Accessions (e.g, using DataEntry, create Accessions in different scopes and ensure they're autonumbered as expected)

General

Please also do general testing focused around autonumbering, especially with concurrent WorkBench uploads!

… when building a case statement for the QB.

…lumn

See #6490, #5337 Replaces #5404 Fixes #4148, #7560 This branch is largely the application of #7455 on `v7.11.3`

Initially from de6d9ec in #7399

Based largely off the initial implementation at 5ed701a from #7399

Addresses #5337 Fixes #4148, #7560

…scope model

emenslin

Looks good! I did run into some migration problems, but since that could be a test panel issue I will approve this, but it is something that should probably be looked into.

bhumikaguptaa

Everything worked as expected! I also came across a few migration errors while testing for the accession auto-numbering.

acwhite211 and others added 30 commits September 30, 2025 12:33

Refactor picklist handling to improve null handling and type coercion…

90b3b66

… when building a case statement for the QB.

Apply format.py changes from issue-7456

ee9d106

Apply changes from adding stats_counts context api

29e01a2

Apply group_concat and blank_nulls changes

2d9dd2c

apply changes from issue-7510

cb1b9dd

Apply new changes for new renumber_tree function

fb5d5e9

Update docker-compose.yml for mariadb 11.8

9151d0a

Fix blank_nulls wrapping numeric CatalogNumber cast instead of raw co…

b77fb62

…lumn

fix customized formatters

dcecec6

fix: Use named locks when autonumbering

4b9f0c3

See #6490, #5337 Replaces #5404 Fixes #4148, #7560 This branch is largely the application of #7455 on `v7.11.3`

chore: simplify autonumber interface

12eb463

feat: backport Redis to v7.11.3 base

dfa7d6a

Initially from de6d9ec in #7399

feat: add utilities for interacting with Redis

f294d5b

Based largely off the initial implementation at 5ed701a from #7399

feat: allow using a Manager to handle named locking

4303545

fix: better handle subsequent requests to get same lock

94fd657

fix: resolve erronous fillin_year in apply_autonumbering

0dd769a

refactor: specify type in apply_autonumbering function

6fad8f9

feat: integrate autonumbering locks with Workbench

4de5c06

Addresses #5337 Fixes #4148, #7560

feat: allow getting scope from model classes

8fbec8b

feat: add more scoping tables

3870a0f

fix: properly respect scope when setting autonumbering keys

e2edb11

fix: resolve typo in static method decorator

d48a7a0

fix: implement comparison operators for scope type

957ba26

fix: internally always use strings for scope types when autonumbering

0039829

feat: spin up a redis instance during backend tests

75964c1

fix: resolve more failing tests

f6e5550

fix: make scopetype helper method static

43fc35d

fix: use ScopeType ints when creating attachments

654c0cd

fix: handle edge case where inferred scope is not related object

04a6922

fix: handle case when lock dispatcher is not present when autonumbering

7942817

melton-jason and others added 7 commits February 2, 2026 18:34

chore: add doc-strings to scoping functions

d5f8120

fix: use proper field object in is_related

ac87330

chore: update loan autonumber test

9676173

fix: correct collection being passed to autonumbering function in tests

0c3e863

fix: respect accession scope when filtering query by collection

07d003e

fix: respect regexp when reading highest stored value

efa9396

Merge pull request #7671 from specify/issue-6490-patch

f36908d

github-project-automation bot added this to General Tester Board Feb 4, 2026

github-project-automation bot moved this to 📋Back Log in General Tester Board Feb 4, 2026

melton-jason added this to the 7.12.0 milestone Feb 4, 2026

melton-jason added 3 commits February 5, 2026 18:59

Merge remote-tracking branch 'origin/main' into v7.11.4-prerelease

ba2c8cc

fix: use app and label name instead of object reference to determine …

cdf0bd1

…scope model

chore: remove unused imports

997724e

melton-jason requested review from a team February 6, 2026 01:59

melton-jason marked this pull request as ready for review February 6, 2026 01:59

emenslin approved these changes Feb 9, 2026

View reviewed changes

emenslin requested a review from a team February 9, 2026 17:07

bhumikaguptaa self-requested a review February 9, 2026 21:50

bhumikaguptaa approved these changes Feb 9, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring changes from `v7.11.4` to `main` #7683

Bring changes from `v7.11.4` to `main` #7683

Uh oh!

melton-jason commented Feb 4, 2026 •

edited

Loading

Uh oh!

emenslin left a comment

Uh oh!

bhumikaguptaa left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Bring changes from v7.11.4 to main #7683

Are you sure you want to change the base?

Bring changes from v7.11.4 to main #7683

Uh oh!

Conversation

melton-jason commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Testing instructions

Sample Database

Uh oh!

emenslin left a comment

Choose a reason for hiding this comment

Uh oh!

bhumikaguptaa left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Bring changes from `v7.11.4` to `main` #7683

Bring changes from `v7.11.4` to `main` #7683

melton-jason commented Feb 4, 2026 •

edited

Loading