From 4080ee7fd090c2becaffffb2ac73e7bfd61c0fa0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 3 Oct 2026 01:56:18 +0000
Subject: [PATCH] fix(deps): update module github.com/amacneil/dbmate/v2 to
 v2.36.0

---
 go.mod                                        |  2 +-
 go.sum                                        |  2 ++
 .../amacneil/dbmate/v2/pkg/dbmate/version.go  |  2 +-
 .../amacneil/dbmate/v2/pkg/dbutil/dbutil.go   |  2 +-
 .../dbmate/v2/pkg/driver/postgres/postgres.go | 33 +++++++++++++++++--
 vendor/modules.txt                            |  2 +-
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index d64c5dc86..eb51d0fe8 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.2
 	buf.build/go/protovalidate v1.4.0
 	github.com/Oudwins/zog v0.23.0
-	github.com/amacneil/dbmate/v2 v2.35.1
+	github.com/amacneil/dbmate/v2 v2.36.0
 	github.com/aws/aws-sdk-go-v2 v1.47.0
 	github.com/aws/aws-sdk-go-v2/config v1.33.5
 	github.com/aws/aws-sdk-go-v2/credentials v1.20.5
diff --git a/go.sum b/go.sum
index 2a4d8489f..9cbb4a3d5 100644
--- a/go.sum
+++ b/go.sum
@@ -22,6 +22,8 @@ github.com/Oudwins/zog v0.23.0 h1:aNjOcy7mE5NWOQVR9sFO1L0YCKfEjWMlaUTNquKGRQY=
 github.com/Oudwins/zog v0.23.0/go.mod h1:yznncrIHC5tQeOui28FMz67LEGZV3nAoCdWL5t8QsNM=
 github.com/amacneil/dbmate/v2 v2.35.1 h1:8R47oxFyo0tuP90Qh6Z/1aePOUuHctZqww/w0pFTR1M=
 github.com/amacneil/dbmate/v2 v2.35.1/go.mod h1:hs95L4ZDoQ51SCmvlEchCmA09G9ftPIL5Rrmc0yVTxs=
+github.com/amacneil/dbmate/v2 v2.36.0 h1:oWxpNxkPSJ57UNaP9x/Icj/Kw12QNiWVzNnBLWkHcLE=
+github.com/amacneil/dbmate/v2 v2.36.0/go.mod h1:9B5Xs1OZ3kJUF739cgWhRDE4qrXs5hoRmTrgnvrpJH8=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
diff --git a/vendor/github.com/amacneil/dbmate/v2/pkg/dbmate/version.go b/vendor/github.com/amacneil/dbmate/v2/pkg/dbmate/version.go
index 02f4a6b31..5408b11ec 100644
--- a/vendor/github.com/amacneil/dbmate/v2/pkg/dbmate/version.go
+++ b/vendor/github.com/amacneil/dbmate/v2/pkg/dbmate/version.go
@@ -1,4 +1,4 @@
 package dbmate
 
 // Version of dbmate
-const Version = "2.35.1"
+const Version = "2.36.0"
diff --git a/vendor/github.com/amacneil/dbmate/v2/pkg/dbutil/dbutil.go b/vendor/github.com/amacneil/dbmate/v2/pkg/dbutil/dbutil.go
index 1de9a2954..3c579ed8e 100644
--- a/vendor/github.com/amacneil/dbmate/v2/pkg/dbutil/dbutil.go
+++ b/vendor/github.com/amacneil/dbmate/v2/pkg/dbutil/dbutil.go
@@ -71,7 +71,7 @@ func TrimLeadingSQLComments(data []byte) ([]byte, error) {
 		// we read bytes directly for premature performance optimization
 		line := scanner.Bytes()
 
-		if preamble && (len(line) == 0 || bytes.Equal(line[0:2], []byte("--"))) {
+		if preamble && (len(line) == 0 || bytes.HasPrefix(line, []byte("--"))) {
 			// header section, skip this line in output buffer
 			continue
 		}
diff --git a/vendor/github.com/amacneil/dbmate/v2/pkg/driver/postgres/postgres.go b/vendor/github.com/amacneil/dbmate/v2/pkg/driver/postgres/postgres.go
index 6f8d54c80..2cfa15b49 100644
--- a/vendor/github.com/amacneil/dbmate/v2/pkg/driver/postgres/postgres.go
+++ b/vendor/github.com/amacneil/dbmate/v2/pkg/driver/postgres/postgres.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"os"
 	"os/exec"
 	"regexp"
 	"runtime"
@@ -99,8 +100,11 @@ func connectionString(u *url.URL) string {
 		query.Del("socket")
 	}
 
+	useEnvHostname := hostname == "" && query.Get("host") == "" && os.Getenv("PGHOST") != ""
+	useEnvPort := port == "" && query.Get("port") == "" && os.Getenv("PGPORT") != ""
+
 	// default hostname
-	if hostname == "" && query.Get("host") == "" {
+	if hostname == "" && query.Get("host") == "" && !useEnvHostname {
 		switch runtime.GOOS {
 		case "linux":
 			query.Set("host", "/var/run/postgresql")
@@ -121,11 +125,17 @@ func connectionString(u *url.URL) string {
 		port = query.Get("port")
 		query.Del("port")
 	}
-	if port == "" {
+	if port == "" && !useEnvPort {
 		switch u.Scheme {
 		case "redshift":
 			port = "5439"
 		default:
+			// lib/pq supplies PostgreSQL's default port when the hostname comes
+			// from PGHOST. Keeping it out of the URL also lets PGPORT take
+			// precedence if both environment variables are configured.
+			if useEnvHostname {
+				break
+			}
 			port = "5432"
 		}
 	}
@@ -134,7 +144,24 @@ func connectionString(u *url.URL) string {
 	out, _ := url.Parse(u.String())
 	// force scheme back to postgres if there was another postgres-compatible scheme
 	out.Scheme = "postgres"
-	out.Host = fmt.Sprintf("%s:%s", hostname, port)
+	switch {
+	case hostname != "" && port != "":
+		out.Host = fmt.Sprintf("%s:%s", hostname, port)
+	case hostname != "":
+		out.Host = hostname
+	case useEnvHostname:
+		out.Host = ""
+		if port != "" {
+			// A URL authority containing only a port would also supply an empty
+			// hostname and overwrite PGHOST, so preserve an explicit or
+			// scheme-specific port as a query parameter instead.
+			query.Set("port", port)
+		}
+	case port != "":
+		out.Host = fmt.Sprintf(":%s", port)
+	default:
+		out.Host = ""
+	}
 	out.RawQuery = query.Encode()
 
 	return out.String()
diff --git a/vendor/modules.txt b/vendor/modules.txt
index b2ae7d536..96727a6af 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -58,7 +58,7 @@ github.com/Oudwins/zog/pkgs/internals
 github.com/Oudwins/zog/pkgs/internals/is
 github.com/Oudwins/zog/pkgs/zss/core
 github.com/Oudwins/zog/zconst
-# github.com/amacneil/dbmate/v2 v2.35.1
+# github.com/amacneil/dbmate/v2 v2.36.0
 ## explicit; go 1.25.0
 github.com/amacneil/dbmate/v2/pkg/dbmate
 github.com/amacneil/dbmate/v2/pkg/dbutil