Skip to content

fix(contrib/drivers/pgsql): ensure fields queries are scoped to the specified schema #4491

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

Closed
qinyuguang wants to merge 1 commit into from
Closed

fix(contrib/drivers/pgsql): ensure fields queries are scoped to the specified schema #4491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions contrib/drivers/pgsql/pgsql_table_fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ FROM pg_attribute a
left join pg_description b ON a.attrelid=b.objoid AND a.attnum = b.objsubid
left join pg_type t ON a.atttypid = t.oid
left join information_schema.columns ic on ic.column_name = a.attname and ic.table_name = c.relname
WHERE c.relname = '%s' and a.attisdropped is false and a.attnum > 0
left join pg_namespace n on c.relnamespace = n.oid
WHERE c.relname = '%s' and n.nspname = '%s' and a.attisdropped is false and a.attnum > 0
ORDER BY a.attnum`
)

Expand All @@ -45,8 +46,9 @@ func (d *Driver) TableFields(ctx context.Context, table string, schema ...string
result gdb.Result
link gdb.Link
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
namespace = gutil.GetOrDefaultStr(defaultSchema, d.GetConfig().Namespace)
// TODO duplicated `id` result?
structureSql = fmt.Sprintf(tableFieldsSqlTmp, table)
structureSql = fmt.Sprintf(tableFieldsSqlTmp, table, namespace)
)
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
Expand Down
Loading