8000 chore: change sql parameter for custom roles to be a `(name,org)` tuple by Emyrk · Pull Request #13480 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

chore: change sql parameter for custom roles to be a (name,org) tuple #13480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 6, 2024
Merged

chore: change sql parameter for custom roles to be a (name,org) tuple #13480

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e98cea
chore: sql parameter to custom roles to be a (name,org) tuple
Emyrk Jun 5, 2024
4356f53
WIP
Emyrk Jun 5, 2024
7f37232
got it working
Emyrk Jun 5, 2024
a305e70
revert logging
Emyrk Jun 5, 2024
8da3601
fixups
Emyrk Jun 5, 2024
dc7fe77
fixup null
Emyrk Jun 5, 2024
a1a42b8
fixup sqlc
Emyrk Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert logging
  • Loading branch information
@Emyrk
Emyrk committed Jun 5, 2024
commit a305e703a89bf7b1a71a7f2b70ea1780966eef13
12 changes: 0 additions & 12 deletions coderd/database/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ package database_test
import (
"context"
"database/sql"
"os"
"testing"

"github.com/google/uuid"
"github.com/lib/pq"
"github.com/rs/zerolog"
sqldblogger "github.com/simukti/sqldb-logger"
"github.com/simukti/sqldb-logger/logadapter/zerologadapter"
"github.com/stretchr/testify/require"

"github.com/coder/coder/v2/coderd/database"
Expand Down Expand Up @@ -96,14 +92,6 @@ func testSQLDB(t testing.TB) *sql.DB {
t.Cleanup(closeFn)

db, err := sql.Open("postgres", connection)
loggerAdapter := zerologadapter.New(zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}))
db = sqldblogger.OpenDriver(connection, db.Driver(), loggerAdapter,
sqldblogger.WithMinimumLevel(sqldblogger.LevelTrace),
sqldblogger.WithPreparerLevel(sqldblogger.LevelTrace), // default: LevelInfo
sqldblogger.WithQueryerLevel(sqldblogger.LevelTrace), // default: LevelInfo
sqldblogger.WithExecerLevel(sqldblogger.LevelTrace), // default: LevelInfo
)

require.NoError(t, err)
t.Cleanup(func() { _ = db.Close() })

Expand Down
Loading
0