Skip to content

add table comments to information_schema.tables #2458

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

Merged
merged 3 commits into from
Apr 15, 2024
Merged

add table comments to information_schema.tables #2458

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
e0704bf
adding table comment to information schema
Apr 15, 2024
a619066
add table comments to info schema
Apr 15, 2024
3d0ddb8
[ga-format-pr] Run ./format_repo.sh to fix formatting
jycor Apr 15, 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
15 changes: 15 additions & 0 deletions enginetest/queries/information_schema_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,6 +1717,21 @@ from information_schema.routines where routine_schema = 'mydb' and routine_type
},
},
},
{

Name: "information_schema.tables has table comments",
SetUpScript: []string{
"create table t (i int primary key) comment 'this is a table comment';",
},
Assertions: []ScriptTestAssertion{
{
Query: "select table_comment from information_schema.tables where table_name = 't';",
Expected: []sql.Row{
{"this is a table comment"},
},
},
},
},
}

var SkippedInfoSchemaScripts = []ScriptTest{
Expand Down
7 changes: 6 additions & 1 deletion sql/information_schema/information_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1822,6 +1822,7 @@ func tablesRowIter(ctx *Context, cat Catalog) (RowIter, error) {
y2k, _, _ := types.Timestamp.Convert("2000-01-01 00:00:00")
err := DBTableIter(ctx, db, func(t Table) (cont bool, err error) {
tableCollation = t.Collation().String()
comment := ""
if db.Name() != InformationSchemaDatabaseName {
if st, ok := t.(StatisticsTable); ok {
tableRows, _, err = st.RowCount(ctx)
Expand Down Expand Up @@ -1856,6 +1857,10 @@ func tablesRowIter(ctx *Context, cat Catalog) (RowIter, error) {
autoInc = nil
}
}

if commentedTable, ok := t.(CommentedTable); ok {
comment = commentedTable.Comment()
}
}

rows = append(rows, Row{
Expand All @@ -1879,7 +1884,7 @@ func tablesRowIter(ctx *Context, cat Catalog) (RowIter, error) {
tableCollation, // table_collation
nil, // checksum
"", // create_options
"", // table_comment
comment, // table_comment
})

return true, nil
Expand Down