Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 pkg/sql/logictest/testdata/logic_test/grant_schema
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ testuser2 test s CREATE NO
testuser test s ALL YES

# Check grants for testuser2, which should inherit from the public role.
query TBB colnames rowsort
query TBB colnames,rowsort
WITH schema_names(schema_name) AS (
SELECT n.nspname AS schema_name
FROM pg_catalog.pg_namespace n
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/information_schema
Original file line number Diff line number Diff line change
Expand Up @@ -2740,7 +2740,7 @@ root other_db public ALL YES
## information_schema.table_privileges and information_schema.role_table_grants

# root can see everything
query TTTTTTTT colnames rowsort
query TTTTTTTT colnames,rowsort
SELECT * FROM system.information_schema.table_privileges ORDER BY table_schema, table_name, table_schema, grantee, privilege_type
----
grantor grantee table_catalog table_schema table_name privilege_type is_grantable with_hierarchy
Expand Down
5 changes: 3 additions & 2 deletions pkg/sql/logictest/testdata/logic_test/statement_statistics
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,11 @@ SELECT z FROM test where y=2;
statement ok
SELECT x FROM test where y=1;

query TB colnames rowsort
query TB colnames
SELECT key, implicit_txn
FROM crdb_internal.node_statement_statistics
WHERE application_name = 'implicit_txn_test' ORDER BY key, implicit_txn;
WHERE application_name = 'implicit_txn_test'
ORDER BY key, implicit_txn;
----
key implicit_txn
SELECT _ false
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/subquery_correlated
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ c_c_id bill rownum
4 TX 2
6 FL 1

query TI colnames rowsort
query TI colnames,rowsort
SELECT
*
FROM
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/logictest/testdata/logic_test/upsert
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ subtest visible_returning_columns
statement ok
BEGIN; ALTER TABLE tc DROP COLUMN y

query I colnames rowsort
query I colnames,rowsort
UPSERT INTO tc VALUES (1), (2) RETURNING *
----
x
Expand Down