Require Go 1.21

I want to use errors.Join(), which was added in Go 1.20. Might as well
use 1.21 so we don't need to have our own version of slices.Contains.

Author: arp242

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         pg: ['14', '15', '16', '17', '18']
-        go: ['1.18', '1.25']
+        go: ['1.21', '1.25']
     steps:
     - uses: 'actions/checkout@v6'
     - uses: 'actions/setup-go@v6'

CHANGELOG.md

@@ -1,6 +1,6 @@
 unreleased
 ----------
-This version of pq requires Go 1.18 or newer.
+This version of pq requires Go 1.21 or newer.
 
 pq now supports only maintained PostgreSQL releases, which is PostgreSQL 14 and
 newer. Previously PostgreSQL 8.4 and newer were supported.

array_test.go

@@ -337,10 +337,10 @@ func TestBoolArrayValue(t *testing.T) {
 }
 
 func BenchmarkBoolArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]bool, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Intn(2) == 0
+		x[i] = rnd.Intn(2) == 0
 	}
 	a := BoolArray(x)
 
@@ -488,12 +488,12 @@ func TestByteaArrayValue(t *testing.T) {
 }
 
 func BenchmarkByteaArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([][]byte, 10)
 	for i := 0; i < len(x); i++ {
 		x[i] = make([]byte, len(x))
 		for j := 0; j < len(x); j++ {
-			x[i][j] = byte(rand.Int())
+			x[i][j] = byte(rnd.Int())
 		}
 	}
 	a := ByteaArray(x)
@@ -645,10 +645,10 @@ func TestFloat64ArrayValue(t *testing.T) {
 }
 
 func BenchmarkFloat64ArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]float64, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.NormFloat64()
+		x[i] = rnd.NormFloat64()
 	}
 	a := Float64Array(x)
 
@@ -798,10 +798,10 @@ func TestInt64ArrayValue(t *testing.T) {
 }
 
 func BenchmarkInt64ArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]int64, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Int63()
+		x[i] = rnd.Int63()
 	}
 	a := Int64Array(x)
 
@@ -952,10 +952,10 @@ func TestFloat32ArrayValue(t *testing.T) {
 }
 
 func BenchmarkFloat32ArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]float32, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Float32()
+		x[i] = rnd.Float32()
 	}
 	a := Float32Array(x)
 
@@ -1105,10 +1105,10 @@ func TestInt32ArrayValue(t *testing.T) {
 }
 
 func BenchmarkInt32ArrayValue(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]int32, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Int31()
+		x[i] = rnd.Int31()
 	}
 	a := Int32Array(x)
 
@@ -1545,10 +1545,10 @@ func TestGenericArrayValueErrors(t *testing.T) {
 }
 
 func BenchmarkGenericArrayValueBools(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]bool, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Intn(2) == 0
+		x[i] = rnd.Intn(2) == 0
 	}
 	a := GenericArray{x}
 
@@ -1558,10 +1558,10 @@ func BenchmarkGenericArrayValueBools(b *testing.B) {
 }
 
 func BenchmarkGenericArrayValueFloat64s(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]float64, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.NormFloat64()
+		x[i] = rnd.NormFloat64()
 	}
 	a := GenericArray{x}
 
@@ -1571,10 +1571,10 @@ func BenchmarkGenericArrayValueFloat64s(b *testing.B) {
 }
 
 func BenchmarkGenericArrayValueInt64s(b *testing.B) {
-	rand.Seed(1)
+	rnd := rand.New(rand.NewSource(1))
 	x := make([]int64, 10)
 	for i := 0; i < len(x); i++ {
-		x[i] = rand.Int63()
+		x[i] = rnd.Int63()
 	}
 	a := GenericArray{x}
 

auth/kerberos/go.mod

@@ -1,6 +1,6 @@
 module github.com/lib/pq/auth/kerberos
 
-go 1.18
+go 1.21
 
 require (
 	github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e

connector.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -516,12 +517,12 @@ func (cfg *Config) setFromTag(o map[string]string, tag string) error {
 				}
 			case reflect.String:
 				if ((tag == "postgres" && k == "sslmode") || (tag == "env" && k == "PGSSLMODE")) &&
-					!pqutil.Contains(sslModes, SSLMode(v)) &&
+					!slices.Contains(sslModes, SSLMode(v)) &&
 					!(strings.HasPrefix(v, "pqgo-") && hasTLSConfig(v[5:])) {
 					return fmt.Errorf(f+`%q is not supported; supported values are %s`, k, v, pqutil.Join(sslModes))
 				}
 				if ((tag == "postgres" && k == "sslnegotiation") || (tag == "env" && k == "PGSSLNEGOTIATION")) &&
-					!pqutil.Contains(sslNegotiations, SSLNegotiation(v)) {
+					!slices.Contains(sslNegotiations, SSLNegotiation(v)) {
 					return fmt.Errorf(f+`%q is not supported; supported values are %s`, k, v, pqutil.Join(sslNegotiations))
 				}
 				rv.SetString(v)
@@ -568,7 +569,7 @@ func (cfg *Config) setFromTag(o map[string]string, tag string) error {
 }
 
 func (cfg Config) isset(name string) bool {
-	return pqutil.Contains(cfg.set, name)
+	return slices.Contains(cfg.set, name)
 }
 
 // Convert to a map; mostly so we don't need to rewrite all the code.
@@ -587,7 +588,7 @@ func (cfg Config) tomap() map[string]string {
 		if k == "" || k == "-" {
 			continue
 		}
-		if !rv.IsZero() || pqutil.Contains(cfg.set, k) {
+		if !rv.IsZero() || slices.Contains(cfg.set, k) {
 			switch rt.Type.Kind() {
 			default:
 				if s, ok := rv.Interface().(fmt.Stringer); ok {

connector_test.go

@@ -1,5 +1,3 @@
-//go:build go1.10
-
 package pq
 
 import (

go.mod

@@ -1,3 +1,3 @@
 module github.com/lib/pq
 
-go 1.18
+go 1.21

internal/pqtest/cert_go119.go

@@ -1,6 +1,8 @@
 package pqtest
 
 import (
+	"crypto/tls"
+	"crypto/x509"
 	"database/sql"
 	"os"
 	"strings"
@@ -40,6 +42,15 @@ func ForceBinaryParameters() bool {
 	}
 }
 
+// InvalidCertificate reports if this error is an "invalid certificate" error.
+func InvalidCertificate(err error) bool {
+	switch err.(type) {
+	case x509.UnknownAuthorityError, x509.HostnameError, *tls.CertificateVerificationError:
+		return true
+	}
+	return false
+}
+
 var envOnce sync.Once
 
 func DSN(conninfo string) string {