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

Jump to bottom

sql: change information_schema routines data types #67641

Merged
merged 1 commit into from
Jul 15, 2021
Merged

sql: change information_schema routines data types #67641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions pkg/sql/logictest/testdata/logic_test/create_statements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,7 +2341,7 @@ CREATE TABLE information_schema.routines (
numeric_scale INT8 NULL,
datetime_precision INT8 NULL,
interval_type STRING NULL,
interval_precision STRING NULL,
interval_precision INT8 NULL,
type_udt_catalog STRING NULL,
type_udt_schema STRING NULL,
type_udt_name STRING NULL,
Expand Down Expand Up @@ -2374,7 +2374,7 @@ CREATE TABLE information_schema.routines (
result_cast_from_data_type STRING NULL,
result_cast_as_locator STRING NULL,
result_cast_char_max_length INT8 NULL,
result_cast_char_octet_length STRING NULL,
result_cast_char_octet_length INT8 NULL,
result_cast_char_set_catalog STRING NULL,
result_cast_char_set_schema STRING NULL,
result_cast_char_set_name STRING NULL,
Expand All @@ -2384,7 +2384,7 @@ CREATE TABLE information_schema.routines (
result_cast_numeric_precision INT8 NULL,
result_cast_numeric_precision_radix INT8 NULL,
result_cast_numeric_scale INT8 NULL,
result_cast_datetime_precision STRING NULL,
result_cast_datetime_precision INT8 NULL,
result_cast_interval_type STRING NULL,
result_cast_interval_precision INT8 NULL,
result_cast_type_udt_catalog STRING NULL,
Expand Down Expand Up @@ -2423,7 +2423,7 @@ CREATE TABLE information_schema.routines (
numeric_scale INT8 NULL,
datetime_precision INT8 NULL,
interval_type STRING NULL,
interval_precision STRING NULL,
interval_precision INT8 NULL,
type_udt_catalog STRING NULL,
type_udt_schema STRING NULL,
type_udt_name STRING NULL,
Expand Down Expand Up @@ -2456,7 +2456,7 @@ CREATE TABLE information_schema.routines (
result_cast_from_data_type STRING NULL,
result_cast_as_locator STRING NULL,
result_cast_char_max_length INT8 NULL,
result_cast_char_octet_length STRING NULL,
result_cast_char_octet_length INT8 NULL,
result_cast_char_set_catalog STRING NULL,
result_cast_char_set_schema STRING NULL,
result_cast_char_set_name STRING NULL,
Expand All @@ -2466,7 +2466,7 @@ CREATE TABLE information_schema.routines (
result_cast_numeric_precision INT8 NULL,
result_cast_numeric_precision_radix INT8 NULL,
result_cast_numeric_scale INT8 NULL,
result_cast_datetime_precision STRING NULL,
result_cast_datetime_precision INT8 NULL,
result_cast_interval_type STRING NULL,
result_cast_interval_precision INT8 NULL,
result_cast_type_udt_catalog STRING NULL,
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/logictest/testdata/logic_test/information_schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3709,7 +3709,7 @@ numeric_precision_radix INT8 true NULL
numeric_scale INT8 true NULL · {} false
datetime_precision INT8 true NULL · {} false
interval_type STRING true NULL · {} false
interval_precision STRING true NULL · {} false
interval_precision INT8 true NULL · {} false
type_udt_catalog STRING true NULL · {} false
type_udt_schema STRING true NULL · {} false
type_udt_name STRING true NULL · {} false
Expand Down Expand Up @@ -3742,7 +3742,7 @@ is_udt_dependent STRING true NULL
result_cast_from_data_type STRING true NULL · {} false
result_cast_as_locator STRING true NULL · {} false
result_cast_char_max_length INT8 true NULL · {} false
result_cast_char_octet_length STRING true NULL · {} false
result_cast_char_octet_length INT8 true NULL · {} false
result_cast_char_set_catalog STRING true NULL · {} false
result_cast_char_set_schema STRING true NULL · {} false
result_cast_char_set_name STRING true NULL · {} false
Expand All @@ -3752,7 +3752,7 @@ result_cast_collation_name STRING true NULL
result_cast_numeric_precision INT8 true NULL · {} false
result_cast_numeric_precision_radix INT8 true NULL · {} false
result_cast_numeric_scale INT8 true NULL · {} false
result_cast_datetime_precision STRING true NULL · {} false
result_cast_datetime_precision INT8 true NULL · {} false
result_cast_interval_type STRING true NULL · {} false
result_cast_interval_precision INT8 true NULL · {} false
result_cast_type_udt_catalog STRING true NULL · {} false
Expand Down
20 changes: 1 addition & 19 deletions pkg/sql/testdata/postgres_test_expected_diffs_on_information_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,10 @@
"TotalColumns": 628,
"MissingTables": 0,
"MissingColumns": 12,
"DatatypeMismatches": 3
"DatatypeMismatches": 0
},
"pgMetadata": {
"routines": {
"interval_precision": {
"oid": 25,
"dataType": "text",
"expectedOid": 20,
"expectedDataType": "INT8"
},
"result_cast_char_octet_length": {
"oid": 25,
"dataType": "text",
"expectedOid": 20,
"expectedDataType": "INT8"
},
"result_cast_datetime_precision": {
"oid": 25,
"dataType": "text",
"expectedOid": 20,
"expectedDataType": "INT8"
},
"scope_schema": null
},
"schemata": {
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/vtable/information_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ CREATE TABLE information_schema.routines (
NUMERIC_SCALE INT,
DATETIME_PRECISION INT,
INTERVAL_TYPE STRING,
INTERVAL_PRECISION STRING,
INTERVAL_PRECISION INT,
TYPE_UDT_CATALOG STRING,
TYPE_UDT_SCHEMA STRING,
TYPE_UDT_NAME STRING,
Expand Down Expand Up @@ -365,7 +365,7 @@ CREATE TABLE information_schema.routines (
RESULT_CAST_FROM_DATA_TYPE STRING,
RESULT_CAST_AS_LOCATOR STRING,
RESULT_CAST_CHAR_MAX_LENGTH INT,
RESULT_CAST_CHAR_OCTET_LENGTH STRING,
RESULT_CAST_CHAR_OCTET_LENGTH INT,
RESULT_CAST_CHAR_SET_CATALOG STRING,
RESULT_CAST_CHAR_SET_SCHEMA STRING,
RESULT_CAST_CHAR_SET_NAME STRING,
Expand All @@ -375,7 +375,7 @@ CREATE TABLE information_schema.routines (
RESULT_CAST_NUMERIC_PRECISION INT,
RESULT_CAST_NUMERIC_PRECISION_RADIX INT,
RESULT_CAST_NUMERIC_SCALE INT,
RESULT_CAST_DATETIME_PRECISION STRING,
RESULT_CAST_DATETIME_PRECISION INT,
RESULT_CAST_INTERVAL_TYPE STRING,
RESULT_CAST_INTERVAL_PRECISION INT,
RESULT_CAST_TYPE_UDT_CATALOG STRING,
Expand Down