Skip to content

Commit 4582e44

Browse files
committed
Fix null column bug again
1 parent c1613c1 commit 4582e44

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

coderd/database/dbtestutil/db.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,16 @@ func NewDB(t *testing.T) (database.Store, database.Pubsub) {
1919
db := databasefake.New()
2020
pubsub := database.NewPubsubInMemory()
2121
if os.Getenv("DB") != "" {
22-
connectionURL, closePg, err := postgres.Open()
23-
require.NoError(t, err)
24-
t.Cleanup(closePg)
22+
connectionURL := os.Getenv("CODER_PG_CONNECTION_URL")
23+
if connectionURL == "" {
24+
var (
25+
err error
26+
closePg func()
27+
)
28+
connectionURL, closePg, err = postgres.Open()
29+
require.NoError(t, err)
30+
t.Cleanup(closePg)
31+
}
2532
sqlDB, err := sql.Open("postgres", connectionURL)
2633
require.NoError(t, err)
2734
t.Cleanup(func() {

coderd/database/queries.sql.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries/quotas.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- name: GetQuotaAllowanceForUser :one
22
SELECT
3-
SUM(quota_allowance)
3+
coalesce(SUM(quota_allowance), 0)::BIGINT
44
FROM
55
group_members gm
66
JOIN groups g ON

0 commit comments

Comments
 (0)