From 3f1bdd8becb978e0d211b0d2a42884698032bcc4 Mon Sep 17 00:00:00 2001 From: August Vi Date: Mon, 19 Oct 2026 16:28:20 -0700 Subject: [PATCH 1/2] Prepare v1.4.3: write the changelog entry and move the install lines to v1.4.3. --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- CHANGELOG.md | 11 ++++++++--- README.md | 10 +++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 6b23da7..76e61c9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,7 +7,7 @@ body: attributes: label: Versions description: sqlx, Go, the driver and the database, each with its version - placeholder: sqlx v1.4.2, go1.27.2, lib/pq v1.10.9, PostgreSQL 16 + placeholder: sqlx v1.4.3, go1.27.2, lib/pq v1.10.9, PostgreSQL 16 validations: required: true - type: textarea diff --git a/CHANGELOG.md b/CHANGELOG.md index d174692..16541af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ Notable changes to this fork, newest first. An entry that imports an upstream pull request names its number and author. Releases up to v1.4.0 are releases of upstream [jmoiron/sqlx](https://github.com/jmoiron/sqlx). -## Unreleased +## v1.4.3 (2026-10-19) + +No API change. Batch inserts report an unclosed `VALUES (` group instead of +producing SQL the database rejects, and expand correctly when the group holds a +bracket inside a string literal or comment. ### Fixes @@ -13,11 +17,12 @@ upstream [jmoiron/sqlx](https://github.com/jmoiron/sqlx). `missing closing bracket in VALUES`, whatever the number of rows. Before, the query came back unexpanded with every row's arguments, and the mistake only surfaced when the database rejected the argument count. Single-struct and map - arguments are unchanged. + arguments are unchanged (#36). - The batch insert expansion skips brackets inside string literals, quoted identifiers and comments. `VALUES (:a, ')')` or `VALUES (:a, /* ) */ :b)` with several rows used to be cut at the bracket inside the literal or comment - and expanded into invalid SQL; `VALUES (:a, '(')` was not expanded at all. + and expanded into invalid SQL; `VALUES (:a, '(')` was not expanded at all + (#36). ## v1.4.2 (2026-10-19) diff --git a/README.md b/README.md index c5667fe..a3bb4ea 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ and go from query to struct in one call with `Get` and `Select`. | | jmoiron/sqlx | secondwindoss/sqlx | |--------------------|------------------------------|-----------------------------------| -| Last release | v1.4.0, April 2024 | v1.4.2, October 2026 | +| Last release | v1.4.0, April 2024 | v1.4.3, October 2026 | | Last commit | May 2024 | active | | Open pull requests | 79 (October 2026) | 0, the fixes are merged | | Go support | `go 1.10`, untested | Go 1.24 and newer, tested | @@ -49,7 +49,7 @@ and go from query to struct in one call with `Get` and `Select`. ## Quick start - go get github.com/secondwindoss/sqlx@v1.4.2 + go get github.com/secondwindoss/sqlx@v1.4.3 sqlx requires Go 1.24 or newer. @@ -109,20 +109,20 @@ Rewrite the import path, then update the dependency. macOS: grep -rl 'github.com/jmoiron/sqlx' --include='*.go' . | xargs sed -i '' 's#github.com/jmoiron/sqlx#github.com/secondwindoss/sqlx#g' - go get github.com/secondwindoss/sqlx@v1.4.2 + go get github.com/secondwindoss/sqlx@v1.4.3 go mod tidy Linux: grep -rl 'github.com/jmoiron/sqlx' --include='*.go' . | xargs sed -i 's#github.com/jmoiron/sqlx#github.com/secondwindoss/sqlx#g' - go get github.com/secondwindoss/sqlx@v1.4.2 + go get github.com/secondwindoss/sqlx@v1.4.3 go mod tidy Tags up to v1.4.0 are upstream's and declare the upstream module path, so v1.4.1 is the first version that resolves under the new path; v1.4.2 retracts the older tags so the go command no longer offers them. -A `replace github.com/jmoiron/sqlx => github.com/secondwindoss/sqlx v1.4.2` +A `replace github.com/jmoiron/sqlx => github.com/secondwindoss/sqlx v1.4.3` directive does not work: the fork imports its own `reflectx` package under the new path, and Go refuses to use one module under two paths. Rewrite the imports instead. From cc669ae4e09244451d29991b61b217214676c7ed Mon Sep 17 00:00:00 2001 From: August Vi Date: Tue, 20 Oct 2026 09:53:57 -0700 Subject: [PATCH 2/2] Date the v1.4.3 changelog entry. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16541af..4f76006 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Notable changes to this fork, newest first. An entry that imports an upstream pull request names its number and author. Releases up to v1.4.0 are releases of upstream [jmoiron/sqlx](https://github.com/jmoiron/sqlx). -## v1.4.3 (2026-10-19) +## v1.4.3 (2026-10-20) No API change. Batch inserts report an unclosed `VALUES (` group instead of producing SQL the database rejects, and expand correctly when the group holds a