Skip to content
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

fix(core): policy db should use pool connection hook to set search_path #1443

Merged
merged 4 commits into from
Aug 23, 2024
Merged

fix(core): policy db should use pool connection hook to set search_path #1443

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
866db1d
fix(core): policy db should use pool connection hook to set search_path
jakedoublev Aug 22, 2024
f0c3de3
Merge branch 'main' into fix/search_path
jakedoublev Aug 22, 2024
c9f714d
debug instead of info
jakedoublev Aug 23, 2024
1c22049
test
jakedoublev Aug 23, 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
23 changes: 15 additions & 8 deletions service/pkg/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,6 @@ func New(ctx context.Context, config Config, logCfg logger.Config, o ...OptsFunc
}
}

// Set the Client search_path to the schema
q := fmt.Sprintf("SET search_path TO %s", config.Schema)
if _, err := c.Pgx.Exec(ctx, q); err != nil {
return nil, fmt.Errorf("failed to SET search_path for db Client schema to [%s]: %w", config.Schema, err)
}

slog.Info("successfully set database client search_path", slog.String("schema", config.Schema))
return &c, nil
}

Expand All @@ -185,7 +178,21 @@ func (c Config) buildConfig() (*pgxpool.Config, error) {
c.Database,
c.SSLMode,
)
return pgxpool.ParseConfig(u)
parsed, err := pgxpool.ParseConfig(u)
if err != nil {
return nil, fmt.Errorf("failed to parse pgx config: %w", err)
}
// Configure the search_path schema immediately on connection opening
parsed.AfterConnect = func(ctx context.Context, conn *pgx.Conn) error {
_, err := conn.Exec(ctx, fmt.Sprintf("SET search_path TO %s", c.Schema))
if err != nil {
slog.Error("failed to set database client search_path", slog.String("schema", c.Schema), slog.String("error", err.Error()))
return err
}
slog.Info("successfully set database client search_path", slog.String("schema", c.Schema))
jakedoublev marked this conversation as resolved.
Show resolved Hide resolved
return nil
}
return parsed, nil
}

// Common function for all queryRow calls
Expand Down
Loading