Skip to content

support reading table comments when two tables in different schemas h… #145

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

Open
saward wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support reading table comments when two tables in different schemas h… #145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c2eaf
support reading table comments when two tables in different schemas h…
May 10, 2022
9a0ecbe
update column comments to work with multiple schemas
Jun 14, 2022
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
10 changes: 8 additions & 2 deletions database/drivers/postgres/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,9 @@ func queryColumnComments(log *log.Logger, db *sql.DB, schemaNames []string) ([]c
(
SELECT pg_catalog.col_description(c.oid, cols.ordinal_position::int)
FROM pg_catalog.pg_class c
JOIN pg_namespace n ON n.oid = c.relnamespace
WHERE c.relname = cols.table_name
AND n.nspname IN (%s)
) AS column_comment
FROM information_schema.columns cols
WHERE cols.table_schema IN (%s)`
Expand All @@ -521,7 +523,8 @@ func queryColumnComments(log *log.Logger, db *sql.DB, schemaNames []string) ([]c
vals[i] = schemaNames[i]
}

query := fmt.Sprintf(q, strings.Join(spots, ", "))
spotsStr := strings.Join(spots, ", ")
query := fmt.Sprintf(q, spotsStr, spotsStr)
rows, err := db.Query(query, vals...)
if err != nil {
return nil, errors.WithMessage(err, "error querying column comments")
Expand Down Expand Up @@ -559,7 +562,9 @@ func queryTableComments(log *log.Logger, db *sql.DB, schemaNames []string) ([]ta
(
SELECT obj_description(c.oid)
FROM pg_class c
JOIN pg_namespace n ON n.oid = c.relnamespace
WHERE c.relname = tabs.table_name
AND n.nspname IN (%s)
) AS column_comment
FROM information_schema.tables tabs
WHERE tabs.table_schema IN (%s)`
Expand All @@ -571,7 +576,8 @@ func queryTableComments(log *log.Logger, db *sql.DB, schemaNames []string) ([]ta
vals[i] = schemaNames[i]
}

query := fmt.Sprintf(q, strings.Join(spots, ", "))
spotsStr := strings.Join(spots, ", ")
query := fmt.Sprintf(q, spotsStr, spotsStr)
rows, err := db.Query(query, vals...)
if err != nil {
return nil, errors.WithMessage(err, "error querying table comments")
Expand Down