diff --git a/functions.go b/functions.go index e406f16..dbde06d 100644 --- a/functions.go +++ b/functions.go @@ -10,7 +10,6 @@ import ( "github.com/initialcapacity/ai-starter/pkg/dbsupport" "github.com/initialcapacity/ai-starter/pkg/feedsupport" "github.com/initialcapacity/ai-starter/pkg/websupport" - _ "github.com/lib/pq" "github.com/tiktoken-go/tokenizer" "net/http" "strings" diff --git a/go.mod b/go.mod index 51c632b..8a855de 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/GoogleCloudPlatform/functions-framework-go v1.8.1 github.com/cloudevents/sdk-go/v2 v2.15.2 github.com/golang-migrate/migrate/v4 v4.17.1 - github.com/lib/pq v1.10.9 + github.com/jackc/pgx/v5 v5.5.4 github.com/pgvector/pgvector-go v0.1.1 github.com/stretchr/testify v1.8.4 github.com/tiktoken-go/tokenizer v0.1.0 @@ -22,13 +22,19 @@ require ( github.com/google/uuid v1.4.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/json-iterator/go v1.1.10 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.10.0 // indirect + golang.org/x/crypto v0.20.0 // indirect + golang.org/x/sync v0.5.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 5c2cd60..2029e26 100644 --- a/go.sum +++ b/go.sum @@ -1014,6 +1014,8 @@ github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/ github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgx/v5 v5.5.4 h1:Xp2aQS8uXButQdnCMWNmvx6UysWQQC+u1EoizjguY+8= github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -1354,6 +1356,8 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/dbsupport/connection.go b/pkg/dbsupport/connection.go index 5a89a61..44a8f11 100644 --- a/pkg/dbsupport/connection.go +++ b/pkg/dbsupport/connection.go @@ -3,12 +3,12 @@ package dbsupport import ( "database/sql" "fmt" - _ "github.com/lib/pq" + _ "github.com/jackc/pgx/v5/stdlib" "log" ) func CreateConnection(databaseUrl string) *sql.DB { - db, err := sql.Open("postgres", databaseUrl) + db, err := sql.Open("pgx", databaseUrl) if err != nil { log.Fatal(fmt.Errorf("unable to connect to database: %w", err)) }