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

Allow database name contain uppercase characters #2504

Merged
merged 15 commits into from
Apr 26, 2023
Merged

Allow database name contain uppercase characters #2504

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
98cd5c9
allow database name contain uppercase characters
syasyayas Apr 22, 2023
3ed9c93
fix docs in diff.md
syasyayas Apr 22, 2023
ec243b5
fix collection names in mongodb tests
syasyayas Apr 24, 2023
497fe0b
fix index name in tests
syasyayas Apr 24, 2023
b278174
Merge branch 'main' into main
syasyayas Apr 24, 2023
91c5e16
fix db names in tests
syasyayas Apr 24, 2023
17c5397
sanitize db names
syasyayas Apr 24, 2023
c6eb555
sanitize more db names
syasyayas Apr 25, 2023
6ae54df
Merge branch 'main' into main
Apr 26, 2023
ab8fa16
WIP
Apr 26, 2023
a5d1b8e
Merge remote-tracking branch 'github-desktop-syasyayas/main' into pr/…
Apr 26, 2023
0bcc509
Merge branch 'main' into main
Apr 26, 2023
a7f0a8e
WIP
Apr 26, 2023
74b0ab6
Merge remote-tracking branch 'github-desktop-syasyayas/main' into pr/…
Apr 26, 2023
a260d10
Merge branch 'main' into main
mergify[bot] Apr 26, 2023
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
WIP
  • Loading branch information
Dmitry committed Apr 26, 2023
commit a7f0a8e2d30f9f67b4fa1f74c217b784ddbcc3c5
6 changes: 3 additions & 3 deletions internal/handlers/pg/pgdb/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func CalculateDBStats(ctx context.Context, tx pgx.Tx, db string) (*DBStats, erro
SUM(pg_total_relation_size(quote_ident(schemaname) || '.' || quote_ident(tablename)))
FROM pg_tables
WHERE schemaname = $1`
args := []any{pgx.Identifier{db}.Sanitize()}
args := []any{db}
row := tx.QueryRow(ctx, sql, args...)

var schemaSize *int32
Expand All @@ -116,10 +116,10 @@ func CalculateDBStats(ctx context.Context, tx pgx.Tx, db string) (*DBStats, erro
COALESCE(SUM(pg_table_size(c.oid)), 0) AS SizeTables,
COALESCE(SUM(pg_indexes_size(c.oid)), 0) AS SizeIndexes
FROM pg_tables AS t
LEFT JOIN pg_class AS c ON c.relname = t.tablename AND c.relnamespace = t.schemaname::regnamespace
LEFT JOIN pg_class AS c ON c.relname = t.tablename AND c.relnamespace = quote_ident(t.schemaname)::regnamespace
LEFT JOIN pg_indexes AS i ON i.schemaname = t.schemaname AND i.tablename = t.tablename
WHERE t.schemaname = $1 AND t.tablename NOT LIKE $2`
args = []any{pgx.Identifier{db}.Sanitize(), reservedPrefix + "%"}
args = []any{db, reservedPrefix + "%"}

row = tx.QueryRow(ctx, sql, args...)
if err := row.Scan(
Expand Down