Skip to content

fix(tool/list-tables): trim whitespace in postgres/cockroachdb table_… #4306

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
beskvladimir-create wants to merge 3 commits into from
Closed

fix(tool/list-tables): trim whitespace in postgres/cockroachdb table_… #4306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ee8e52
fix(tool/list-tables): trim whitespace in postgres/cockroachdb table_…
beskvladimir-create Oct 22, 2026
137d767
refactor(tool/list-tables): use regexp_split_to_array to split postgr…
beskvladimir-create Oct 23, 2026
0e323d4
refactor(tool/list-tables): use regexp_split_to_array to split cockro…
beskvladimir-create Oct 23, 2026
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
2 changes: 1 addition & 1 deletion internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const listTablesStatement = `
CROSS JOIN desired_relkinds dk
WHERE
t.relkind = ANY(dk.kinds)
AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(string_to_array($1,',')))
AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(regexp_split_to_array(TRIM($1), '\s*,\s*')))
AND ns.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast', 'crdb_internal', 'pg_extension')
AND ns.nspname NOT LIKE 'pg_temp_%' AND ns.nspname NOT LIKE 'pg_toast_temp_%'
),
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/postgres/postgreslisttables/postgreslisttables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const listTablesStatement = `
CROSS JOIN desired_relkinds dk
WHERE
t.relkind = ANY(dk.kinds) -- Filter by selected table relkinds ('r', 'p')
AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(string_to_array($1,','))) -- $1 is object_names
AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(regexp_split_to_array(TRIM($1), '\s*,\s*'))) -- $1 is object_names
AND ns.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast','google_ml')
AND ns.nspname NOT LIKE 'pg_temp_%' AND ns.nspname NOT LIKE 'pg_toast_temp_%'
),
Expand Down
7 changes: 7 additions & 0 deletions tests/tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,13 @@ func RunPostgresListTablesTest(t *testing.T, tableNameParam, tableNameAuth, user
wantStatusCode: http.StatusOK,
want: fmt.Sprintf("[%s,%s]", getDetailedWant(tableNameAuth, authTableColumns), getDetailedWant(tableNameParam, paramTableColumns)),
},
{
name: "invoke list_tables with multiple table names and surrounding whitespace",
toolName: "list_tables",
args: map[string]any{"table_names": fmt.Sprintf(" %s , %s ", tableNameParam, tableNameAuth)},
wantStatusCode: http.StatusOK,
want: fmt.Sprintf("[%s,%s]", getDetailedWant(tableNameAuth, authTableColumns), getDetailedWant(tableNameParam, paramTableColumns)),
},
{
name: "invoke list_tables with non-existent table",
toolName: "list_tables",
Expand Down
Loading