Merge lib/pq upstream (139 commits)#1322
Closed
acoshift wants to merge 7 commits into
Closed
Conversation
…-williamson-8adb76 # Conflicts: # .github/workflows/codeql-analysis.yml # .github/workflows/test.yml # array_test.go # conn.go # conn_go18.go # conn_test.go # encode_test.go # go.mod # ssl.go # ssl_test.go
Upstream lib/pq kept NullTime as a deprecated alias for sql.NullTime. This repository previously removed NullTime entirely in #3, so drop it again after the merge to preserve that decision. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Contributor
Author
|
Sorry, wrong repository — meant to target the moonrhythm/pq fork. |
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
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.
Summary
Merges 139 commits from
lib/pqupstream (upstream/master) into this fork, bringing in the context-support refactor, NamedValueChecker,internal/pgpassextraction, modern Docker-based CI,pqerrorpackage,Config-based options, multi-host/load-balancing,require_auth, SNI/SSL improvements, and many test refactors.Conflict resolutions
All fork customizations were either already incorporated upstream or made obsolete by upstream's refactors — upstream's version won every content conflict:
ce86388) and NamedValueChecker support (ensure we pass the user and password #2/cbd59e2, Add support for NamedValueChecker interface #1125/402d43b) are now native upstream.pgpasshandling moved tointernal/pgpass/pgpass.go;CheckNamedValueis atconn.go:863.go 1.20to upstream'sgo 1.23.docker compose+testdata/CI matrix (PG 14–18, Go 1.23/1.26, pgbouncer, CockroachDB).Config-based API..github/workflows/codeql-analysis.yml(superseded bystaticcheck.yml)conn_go18.go(refactored away by the context-support overhaul)conn_go19.go—CheckNamedValuenow lives inconn.goconn_go19_test.go—TestArrayArgis nowTestArrayParameterinarray_test.goNullTime
Upstream kept
NullTimeas a deprecated alias (type NullTime = sql.NullTime). Fork PR #3 removed it entirely; that decision is preserved via a follow-up commit (c910a05) that drops the alias fromdeprecated.go.Verification
go build ./...— cleango vet ./...— cleango test -run=DontRunAnyTests ./...— all test packages compile (integration tests require a running Postgres)auth/kerberossubmodule — builds cleanTest plan
pq.NullTime(now removed)Query/Exec(non-Context) onconn— upstream removed these from the public surface🤖 Generated with Claude Code