Commit 2c13ff50 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Switch database driver from pq to pgx.

parent 2178c4c9

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Update GRPC (1.21.1), GRPC-Gateway (1.9.2), Protobuf (1.3.1), Mux (1.7.2), and OpenCensus (0.22.0) dependencies.

- Use Go 1.12.6 as base Docker container image and native builds.

- Move from dep to Go modules for dependency management.

- Switch database driver from pq to pgx.



### Fixed

- Fix delayed first time invocation of tournament and leaderboard callbacks.

ga/ga.go

+0 −18
Original line number Diff line number Diff line
@@ -35,24 +35,6 @@ type Event struct { 
	Ev string // event value

}



// AppInfo represents a mobile app info GA event.

type AppInfo struct {

	An   string // app name

	Aid  string // app identifier

	Av   string // app version

	Aiid string // app installer identifier

}



// SendAppInfo will send the AppInfo struct to GA over HTTP.

func SendAppInfo(httpc *http.Client, gacode string, cookie string, app *AppInfo) error {

	values := url.Values{}

	values.Add("an", app.An)

	values.Add("av", app.Av)

	values.Add("aid", app.Aid)

	values.Add("aiid", app.Aiid)

	return SendValues(httpc, gacode, cookie, values)

}



// SendEvent will send the event struct to GA over HTTP.

func SendEvent(httpc *http.Client, gacode string, cookie string, event *Event) error {

	if len(event.Ec) < 1 || len(event.Ea) < 1 {

go.mod

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ require ( 
	github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 // indirect

	github.com/blevesearch/go-porterstemmer v1.0.2 // indirect

	github.com/blevesearch/segment v0.0.0-20160915185041-762005e7a34f // indirect

	github.com/cockroachdb/apd v1.1.0 // indirect

	github.com/couchbase/vellum v0.0.0-20190610201045-ec7b775d247f // indirect

	github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect

	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
@@ -29,12 +30,16 @@ require ( 
	github.com/gorilla/mux v1.7.2

	github.com/gorilla/websocket v0.0.0-20190427040300-80c2d40e9b91

	github.com/grpc-ecosystem/grpc-gateway v1.9.2

	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect

	github.com/jackc/pgx v3.4.0+incompatible

	github.com/jmhodges/levigo v1.0.0 // indirect

	github.com/lib/pq v0.0.0-20190507191800-2ff3cb3adc01

	github.com/lib/pq v1.1.1 // indirect

	github.com/mattn/go-sqlite3 v1.10.0 // indirect

	github.com/pkg/errors v0.8.1

	github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 // indirect

	github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c

	github.com/satori/go.uuid v1.2.0 // indirect

	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect

	github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect

	github.com/stretchr/testify v1.3.0

	github.com/syndtr/goleveldb v1.0.0 // indirect

go.sum

+12 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR 
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=

github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=

github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=

github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=

github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -115,6 +117,10 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T 
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=

github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=

github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=

github.com/jackc/pgx v3.4.0+incompatible h1:XRfh5KFhf3AVttfC0D93ij0oNNGYlSm0xlc532nXdBM=

github.com/jackc/pgx v3.4.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=

github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=

github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=

github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
@@ -132,8 +138,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN 
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=

github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

github.com/lib/pq v0.0.0-20190507191800-2ff3cb3adc01 h1:Tw9dWgbVf7xkUElIQjbW922J6i8Zl944Sd73C++JzjI=

github.com/lib/pq v0.0.0-20190507191800-2ff3cb3adc01/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=

github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=

github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=

github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=

github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=

github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
@@ -174,6 +180,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR 
github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c h1:D7a64hNIAYYKqFtELrXTROQ1xjvbK4S4pzegr6xUEUQ=

github.com/rubenv/sql-migrate v0.0.0-20190618074400-f4d34eae5a5c/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=

github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=

github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=

github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=

github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=

github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=

github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

main.go

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import ( 
	"github.com/heroiclabs/nakama/migrate"

	"github.com/heroiclabs/nakama/server"

	"github.com/heroiclabs/nakama/social"

	_ "github.com/lib/pq"

	_ "github.com/jackc/pgx/stdlib"

	"go.uber.org/zap"

	"go.uber.org/zap/zapcore"

)
@@ -211,7 +211,7 @@ func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) 
	}



	multiLogger.Debug("Complete database connection URL", zap.String("raw_url", parsedUrl.String()))

	db, err := sql.Open("postgres", parsedUrl.String())

	db, err := sql.Open("pgx", parsedUrl.String())

	if err != nil {

		multiLogger.Fatal("Error connecting to database", zap.Error(err))

	}