[bpamiri]

Fixes #4189

This changes behaviour: singularize("databases") was databasis.

Summary

The singularize -ses rule for basis (…|(b)a|…)ses$) also matched the end of databases, so singularize("databases") returned databasis on every engine.

This PR adds (database)s$ → \1 just before the -ses rules, the same dedicated rule Rails uses. It only matches words ending in databases.

Compatibility. An app that relied on databasis, for example a model or table named after it, needs to rename it. That's unlikely; the changelog fragment says so.

Conflict. This PR and #4188 edit the same singularize rule line. #4188 merged first; develop is merged in here, and the rule line now differs from develop only by the added (database)s$ rule.

Upgrade notes

• The changelog fragment is a changed one (changelog.d/4189-singularize-databases.changed.md).
• The 4.1 to 4.2 upgrade guide's "singularize() corrects some -ses words" entry (added by fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188) is extended with this change, rather than adding a second entry.

Test plan

• New spec. vendor/wheels/tests/specs/global/SingularizeDatabasesSpec.cfc checks databases, Databases and userDatabases. It also pins the current output for bases (→ basis), cases, phases, purchases and vases, and pluralize for the singular forms.
• RED on develop: Lucee 7 and BoxLang each fail only the databases spec (databasis); the other two specs pass.
• GREEN: 3/3 on Lucee 7 and BoxLang.
• global directory (pass / fail / error):

Engine	Result
Lucee 7	308 / 0 / 0
Lucee 6	308 / 0 / 0
Adobe ColdFusion 2023	307 / 0 / 0
Adobe ColdFusion 2025	307 / 0 / 0
BoxLang	308 / 0 / 0
RustCFML v0.693.0	307 / 0 / 0

• Full suite (tools/test-local.sh, Lucee 7 + SQLite): 6525 passed.

• After merging develop (for 4.2): global specs (SQLite) 313 / 0 / 0 on Lucee 7, Lucee 6 and BoxLang, 312 / 0 / 0 on Adobe 2023, Adobe 2025 and RustCFML v0.693.0; full core suite, Lucee 7 + SQLite: 6703 passed (including the internal repo-path specs); guides build passes.

🤖 Generated with Claude Code

[bpamiri]

rev1-r1 review @ 6f4e108 (draft, 4.3): APPROVE on code; merge gated on compat-matrix run 37114969130 and on 4.2.0 shipping.

• (database)s$ → \1 goes ahead of the -ses rules, so databases is singularized before the (b)a…ses$ alternative can turn its "…bases" ending into databasis. The rule loop takes the first matching rule, so placement is what matters.
• The pattern is anchored only at the end, so compounds (mydatabases, testDatabases via the camelCase tail split) singularize the same way. No other word is affected: bases → basis is unchanged (whether that's the right reading of bases is a separate, pre-existing question), and the spec pins cases/phases/purchases/vases as before.
• It conflicts textually with fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188 (the same rule line). Whichever merges second needs a rebase that keeps both changes: fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188's \1sis and this PR's new (database)s$ rule.

[github-actions]

Wheels Test Results

218 119 tests   213 893 ✅  1h 12m 10s ⏱️
 16 768 suites    4 226 💤
     32 files          0 ❌

Results for commit 078584b.

♻️ This comment has been updated with latest results.

[bpamiri]

Final: APPROVE @ 078584b (lifted into 4.2; matrix 37269045190, all 32 legs read)

Delta since my approval at 6f4e108

• The strings.cfm conflict resolution is correct. The merged singularize rule list is exactly develop's line, including fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188's (analy|ba|…)ses$ rule, plus only (database)s$,\1,, placed before the -ses rules. The rule loop breaks on the first ReFindNoCase match, so databases no longer reaches the ba-ses branch, and \1 keeps the case (Databases → Database).
• The spec and fragment content are unchanged; the fragment is retyped to changed.
• fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188's guide entry is extended accurately. Its unchanged-word list matches the spec's cases, and it adds the note about renaming anything named after databasis.

Matrix

• 32/32 legs have 0 fail, 0 error.
• In every leg (lucee6/7, adobe2023/2025, boxlang × every database), all with 0 skipped:
  • SingularizeDatabasesSpec 3/3
  • fix: stop singularize() turning psychoanalyses into psychoanalyasis #4188's SingularizeSesRuleSpec 2/2
  • fix: stop pluralize() throwing on BoxLang for -ex, -lf and -rf words #4186's InflectionRuleGroupsSpec 3/3
• Skips against my earlier develop reference (perf(router): index dynamic routes by method and first two path segments #4183's matrix 37261921912): the only additions are fix(model): bind Oracle integers beyond 64 bits as text #4173's Oracle-only and fix(model): bind decimals beyond 15 significant digits exactly #4190's adapter-specific cases. Both merged into develop since then, and neither comes from this PR.

No open findings.