Skip to content

sql: fix a couple of spots where we missed JSONPATH and LTREE#156691

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
yuzefovich:fix-json-misc
Nov 5, 2025
Merged

sql: fix a couple of spots where we missed JSONPATH and LTREE#156691
craig[bot] merged 1 commit intocockroachdb:masterfrom
yuzefovich:fix-json-misc

Conversation

@yuzefovich
Copy link
Copy Markdown
Member

@yuzefovich yuzefovich commented Oct 31, 2025

We forgot to include DJsonpath and DLTree into some of the type switches when converting datums into string format for miscellaneous builtins. This is now fixed. I decided to omit a release note given these seem like edge cases.

Fixes: #156511.
Fixes: #156611.
Release note: None

@yuzefovich yuzefovich requested a review from a team as a code owner October 31, 2025 21:15
@yuzefovich yuzefovich requested a review from a team October 31, 2025 21:15
@yuzefovich yuzefovich added backport-25.3.x Flags PRs that need to be backported to 25.3 backport-25.4.x Flags PRs that need to be backported to 25.4 labels Oct 31, 2025
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@yuzefovich yuzefovich requested review from a team and mw5h and removed request for a team October 31, 2025 21:16
We forgot to include `DJsonpath` and `DLTree` into some of the type
switches when converting datums into string format for miscellaneous
builtins. This is now fixed. I decided to omit a release note given
these seem like edge cases.

Release note: None
@yuzefovich
Copy link
Copy Markdown
Member Author

TFTR!

bors r+

craig bot pushed a commit that referenced this pull request Nov 5, 2025
156691: sql: fix a couple of spots where we missed JSONPATH and LTREE r=yuzefovich a=yuzefovich

We forgot to include `DJsonpath` and `DLTree` into some of the type switches when converting datums into string format for miscellaneous builtins. This is now fixed. I decided to omit a release note given these seem like edge cases.

Fixes: #156511.
Fixes: #156611.
Release note: None

156954: roachtest/npgsql: skip on s390x r=fqazi a=fqazi

Previously, the npgsql test was running on S390X, which doesn't have the required binaries. To address this, this patch excludes the IBM cloud.

Fixes: #156622

Release note: None

156958: ci: make env vars across cloud providers consistent for roachtest r=srosenberg,rickystewart a=williamchoe3

Noticed some inconsistency, this aligns gce azure aws ibm
Just with `EXTRA_ROACHTEST_ARGS` and `ALWAYS_COLLECT_ARTIFACTS`

Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
Co-authored-by: Faizan Qazi <faizan@cockroachlabs.com>
Co-authored-by: William Choe <williamchoe3@gmail.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 5, 2025

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 5, 2025

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Nov 5, 2025

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.


Issue #156511: branch-release-25.3, branch-release-25.4.


Issue #156611: branch-release-25.3.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Nov 5, 2025

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 8de38b7 to blathers/backport-release-25.3-156691: POST https://api.github.com/repos/yuzefovich/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 25.3.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-25.3.x Flags PRs that need to be backported to 25.3 backport-25.4.x Flags PRs that need to be backported to 25.4 backport-failed v26.1.0-prerelease

Projects

None yet

3 participants