[bot] Merge 26.3 to 26.5 (Conflicts)#7642
Merged
github-actions[bot] merged 8 commits intorelease26.5-SNAPSHOTfrom May 5, 2026
Merged
[bot] Merge 26.3 to 26.5 (Conflicts)#7642github-actions[bot] merged 8 commits intorelease26.5-SNAPSHOTfrom
github-actions[bot] merged 8 commits intorelease26.5-SNAPSHOTfrom
Conversation
#### Rationale 1. age_in_days / age(..., SQL_TSI_DAY) — Preserves SQL Server's calendar-boundary semantics for timestampdiff(SQL_TSI_DAY, ...) on Postgres, where the native operator counts 24-hour intervals instead. Consistent with the existing age_in_months/age_in_years functions; permanent addition to LabKey SQL. 2. CAST(... AS BOOLEAN) in SELECT lists (QuerySelect.java) — On SQL Server, boolean QMethodCalls in a select list are wrapped in CASE WHEN (...) THEN 1 ELSE 0 END to avoid predicates as scalar values. But CAST(x AS BIT) is already a value, not a predicate, and SQL Server rejects the wrapped form. Fix excludes ConvertInfo from the wrap. (repro: insert failing query / error) 3. DatabaseMigrationService.registerSchemaContributor — Interface for DatabaseMigrationService.registerSchemaContributor in premiumModules #### Related Pull Requests - LabKey/premiumModules#499 - LabKey/tnprcEHRModules#277 - LabKey/ehrModules#1119 #### Changes - Method.java — age_in_days method, age(..., SQL_TSI_DAY) dispatch, updated validation - QueryTestCase.jsp — tests for both new syntaxes including datetime calendar-boundary cases - LabKeySql.md — documents age_in_days - QuerySelect.java — skip boolean wrap for CAST/CONVERT on SQL Server - DatabaseMigrationService.java — new registerSchemaContributor interface method --------- Co-authored-by: Adam Rauch <adam@labkey.com>
#### Rationale LabKey/internal-issues#936 Avoid automatic conversion to `String[]` when the view name contains commas.
#### Rationale New test cases for encryption key migration are causing some other tests to fail with an error banner. #7589 <img width="968" height="250" alt="image" src="https://github.com/user-attachments/assets/8a87878c-43b0-4904-91c4-27910107171d" /> Example failure: https://teamcity.labkey.org/buildConfiguration/LabKey_263Release_External_Ehr_DailyEhrPostgres/3962292?buildTab=tests&status=failed&suite=org.labkey.test.Runner%3A+&package=org.labkey.test.tests.wnprc_ehr&class=WNPRC_EHRTest&expandedTest=build%3A%28id%3A3962292%29%2Cid%3A2000000558 #### Changes - Reset our error count after the test #### Tasks 📍 - [x] Confirm test passes again: https://teamcity.labkey.org/buildConfiguration/LabKey_263Release_External_Ehr_DailyEhrPostgres/3965004
#### Rationale Useful for mothership schema. It's kinda long, but Claude thinks it's justified. #### Related Pull Requests - <!-- list of links to related pull requests (replace this comment) --> #### Changes - <!-- list of descriptions of changes that are worth noting (replace this comment) --> <!-- list of standard tasks (remove this comment to enable) #### Tasks 📍 - [ ] Manual Testing - [ ] Test Automation - [ ] Verify Fix -->
…resolve correctly when added to assay results grid if sample lookup is set to a specific sample type (#7640) - use schema getTable() for materialIdForeignKey instead of custom createLookupTableInfo() - add test case to AssayTest
labkey-klum
force-pushed
the
26.5_fb_bot_merge_26.3
branch
from
3e2a4da to
8329c39
Compare
labkey-klum
approved these changes
May 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic merge failed! Please merge
26.3into26.5_fb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.5_fb_bot_merge_26.3