Skip to content

Commit

Permalink
sql: fix information_schema.constraint_column_usage.constraint_schema
Browse files Browse the repository at this point in the history 
Found while working on cockroachdb#22298.

This column was missed in cockroachdb#22753. It was displaying each constraint's
database instead of each constraint's schema.

Release note (bug fix): The constraint_schema column in
information_schema.constraint_column_usage now displays the
constraint's schema instead of its catalog.
  • Loading branch information
@nvanbenschoten
nvanbenschoten committed May 1, 2018
1 parent fd41e5b commit 0ac7288
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
14 changes: 7 additions & 7 deletions pkg/sql/information_schema.go
View file
Expand Up @@ -382,13 +382,13 @@ CREATE TABLE information_schema.constraint_column_usage (
tableNameStr := tree.NewDString(conTable.Name)
for _, col := range conCols {
if err := addRow(
dbNameStr, // table_catalog
scNameStr, // table_schema
tableNameStr, // table_name
tree.NewDString(col), // column_name
dbNameStr, // constraint_catalog
tree.NewDString(db.Name), // constraint_schema
conNameStr, // constraint_name
dbNameStr, // table_catalog
scNameStr, // table_schema
tableNameStr, // table_name
tree.NewDString(col), // column_name
dbNameStr, // constraint_catalog
scNameStr, // constraint_schema
conNameStr, // constraint_name
); err != nil {
return err
}
Expand Down
58 changes: 29 additions & 29 deletions pkg/sql/logictest/testdata/logic_test/information_schema
View file
Expand Up @@ -609,29 +609,29 @@ FROM system.information_schema.constraint_column_usage
ORDER BY TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME
----
table_catalog table_schema table_name column_name constraint_catalog constraint_schema constraint_name
system public descriptor id system system primary
system public eventlog timestamp system system primary
system public eventlog uniqueID system system primary
system public jobs id system system primary
system public lease descID system system primary
system public lease expiration system system primary
system public lease nodeID system system primary
system public lease version system system primary
system public locations localityKey system system primary
system public locations localityValue system system primary
system public namespace name system system primary
system public namespace parentID system system primary
system public rangelog timestamp system system primary
system public rangelog uniqueID system system primary
system public role_members member system system primary
system public role_members role system system primary
system public settings name system system primary
system public table_statistics statisticID system system primary
system public table_statistics tableID system system primary
system public ui key system system primary
system public users username system system primary
system public web_sessions id system system primary
system public zones id system system primary
system public descriptor id system public primary
system public eventlog timestamp system public primary
system public eventlog uniqueID system public primary
system public jobs id system public primary
system public lease descID system public primary
system public lease expiration system public primary
system public lease nodeID system public primary
system public lease version system public primary
system public locations localityKey system public primary
system public locations localityValue system public primary
system public namespace name system public primary
system public namespace parentID system public primary
system public rangelog timestamp system public primary
system public rangelog uniqueID system public primary
system public role_members member system public primary
system public role_members role system public primary
system public settings name system public primary
system public table_statistics statisticID system public primary
system public table_statistics tableID system public primary
system public ui key system public primary
system public users username system public primary
system public web_sessions id system public primary
system public zones id system public primary

statement ok
CREATE DATABASE constraint_db
Expand Down Expand Up @@ -668,15 +668,15 @@ constraint_db public fk constraint_db public
query TTTTTTT colnames
SELECT *
FROM information_schema.constraint_column_usage
WHERE constraint_schema = 'constraint_db'
WHERE constraint_catalog = 'constraint_db'
ORDER BY TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME
----
table_catalog table_schema table_name column_name constraint_catalog constraint_schema constraint_name
constraint_db public t1 a constraint_db constraint_db c2
constraint_db public t1 a constraint_db constraint_db check_a
constraint_db public t1 a constraint_db constraint_db fk
constraint_db public t1 a constraint_db constraint_db t1_a_key
constraint_db public t1 p constraint_db constraint_db primary
constraint_db public t1 a constraint_db public c2
constraint_db public t1 a constraint_db public check_a
constraint_db public t1 a constraint_db public fk
constraint_db public t1 a constraint_db public t1_a_key
constraint_db public t1 p constraint_db public primary

statement ok
DROP DATABASE constraint_db CASCADE
Expand Down

0 comments on commit 0ac7288

Please sign in to comment.