Skip to content

Commit 39f32a5

Browse files
committed
fix ci
1 parent b883e59 commit 39f32a5

File tree

9 files changed

+551
-534
lines changed

9 files changed

+551
-534
lines changed

src/query/service/tests/it/storages/testdata/columns_table.txt

Lines changed: 496 additions & 481 deletions
Large diffs are not rendered by default.

tests/sqllogictests/suites/base/01_system/01_0003_information_schema.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ default
6565
default
6666
default
6767
default
68+
default
69+
default
6870

6971
statement ok
7072
drop table if exists t

tests/sqllogictests/suites/base/06_show/06_0015_show_columns.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ CREATE TABLE showcolumn.t3(c1 int null default 4, c2 Datetime not null default '
1616
query TTTTTT
1717
SHOW COLUMNS FROM default.showcolumn.t3
1818
----
19-
c1 INT YES 4 NULL NULL
20-
c2 TIMESTAMP NO '2022-02-02 12:00:00.000000' NULL NULL
21-
c3 VARCHAR NO 'c3' NULL NULL
19+
c1 int YES 4 NULL NULL
20+
c2 timestamp NO '2022-02-02 12:00:00.000000' NULL NULL
21+
c3 varchar(16382) NO 'c3' NULL NULL
2222

2323
statement ok
2424
CREATE TABLE showcolumn.t4(c1 int comment '4', c2 Datetime comment '2022-02-02 12:00:00', c3 String comment 'c\s3') ENGINE = Null;

tests/sqllogictests/suites/base/20+_others/20_0000_describe_table.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ nullable TINYINT UNSIGNED YES NULL (empty)
6666
is_nullable VARCHAR NO '' (empty)
6767
data_type VARCHAR NO '' (empty)
6868
column_type VARCHAR NO '' (empty)
69-
character_maximum_length NULL NO NULL (empty)
70-
character_octet_length NULL NO NULL (empty)
69+
character_maximum_length SMALLINT UNSIGNED YES NULL (empty)
70+
character_octet_length SMALLINT UNSIGNED YES NULL (empty)
7171
numeric_precision NULL NO NULL (empty)
7272
numeric_precision_radix NULL NO NULL (empty)
7373
numeric_scale NULL NO NULL (empty)
7474
datetime_precision NULL NO NULL (empty)
7575
character_set_catalog NULL NO NULL (empty)
7676
character_set_schema NULL NO NULL (empty)
77-
character_set_name NULL NO NULL (empty)
77+
character_set_name VARCHAR YES NULL (empty)
7878
collation_catalog NULL NO NULL (empty)
7979
collation_schema NULL NO NULL (empty)
80-
collation_name NULL NO NULL (empty)
80+
collation_name VARCHAR YES NULL (empty)
8181
domain_catalog NULL NO NULL (empty)
8282
domain_schema NULL NO NULL (empty)
8383
domain_name NULL NO NULL (empty)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
statement ok
22
DROP DATABASE IF EXISTS xx
33

4-
statement error (?s)1003,.*Unknown database "default".xx \.
4+
statement error 1003
55
select * from xx.yy;

tests/suites/0_stateless/18_rbac/18_0007_privilege_access.result

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,41 @@ test -- show tables from grant_db
6666
t
6767
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for database 'system'
6868
test -- show columns from one from system
69-
dummy TINYINT UNSIGNED NO NULL NULL
70-
c1 INT NO NULL NULL
69+
dummy tinyint unsigned NO NULL NULLO NULL NULL
70+
c1 int NO NULL NULL
7171
0
7272
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for table 'system.tasks'
73-
bloom_index_size BIGINT UNSIGNED YES NULL NULL
74-
catalog VARCHAR NO NULL NULL
75-
cluster_by VARCHAR NO NULL NULL
76-
comment VARCHAR NO NULL NULL
77-
created_on TIMESTAMP NO NULL NULL
78-
data_compressed_size BIGINT UNSIGNED YES NULL NULL
79-
data_size BIGINT UNSIGNED YES NULL NULL
80-
database VARCHAR NO NULL NULL
81-
database_id BIGINT UNSIGNED NO NULL NULL
82-
dropped_on TIMESTAMP YES NULL NULL
83-
engine VARCHAR NO NULL NULL
84-
engine_full VARCHAR NO NULL NULL
85-
index_size BIGINT UNSIGNED YES NULL NULL
86-
inverted_index_size BIGINT UNSIGNED YES NULL NULL
87-
is_attach VARCHAR NO NULL NULL
88-
is_external BOOLEAN NO NULL NULL
89-
is_transient VARCHAR NO NULL NULL
90-
name VARCHAR NO NULL NULL
91-
ngram_index_size BIGINT UNSIGNED YES NULL NULL
92-
num_rows BIGINT UNSIGNED YES NULL NULL
93-
number_of_blocks BIGINT UNSIGNED YES NULL NULL
94-
number_of_segments BIGINT UNSIGNED YES NULL NULL
95-
owner VARCHAR YES NULL NULL
96-
storage_param VARCHAR NO NULL NULL
97-
table_id BIGINT UNSIGNED NO NULL NULL
98-
table_option VARCHAR NO NULL NULL
99-
table_type VARCHAR NO NULL NULL
100-
total_columns BIGINT UNSIGNED NO NULL NULL
101-
updated_on TIMESTAMP NO NULL NULL
102-
vector_index_size BIGINT UNSIGNED YES NULL NULL
103-
virtual_column_size BIGINT UNSIGNED YES NULL NULL
73+
bloom_index_size bigint unsigned YES NULL NULL
74+
catalog varchar(16382) NO NULL NULL
75+
cluster_by varchar(16382) NO NULL NULL
76+
comment varchar(16382) NO NULL NULL
77+
created_on timestamp NO NULL NULL
78+
data_compressed_size bigint unsigned YES NULL NULL
79+
data_size bigint unsigned YES NULL NULL
80+
database varchar(16382) NO NULL NULL
81+
database_id bigint unsigned NO NULL NULL
82+
dropped_on timestamp YES NULL NULL
83+
engine varchar(16382) NO NULL NULL
84+
engine_full varchar(16382) NO NULL NULL
85+
index_size bigint unsigned YES NULL NULL
86+
inverted_index_size bigint unsigned YES NULL NULL
87+
is_attach varchar(16382) NO NULL NULL
88+
is_external boolean NO NULL NULL
89+
is_transient varchar(16382) NO NULL NULL
90+
name varchar(16382) NO NULL NULL
91+
ngram_index_size bigint unsigned YES NULL NULL
92+
num_rows bigint unsigned YES NULL NULL
93+
number_of_blocks bigint unsigned YES NULL NULL
94+
number_of_segments bigint unsigned YES NULL NULL
95+
owner varchar(16382) YES NULL NULL
96+
storage_param varchar(16382) NO NULL NULL
97+
table_id bigint unsigned NO NULL NULL
98+
table_option varchar(16382) NO NULL NULL
99+
table_type varchar(16382) NO NULL NULL
100+
total_columns bigint unsigned NO NULL NULL
101+
updated_on timestamp NO NULL NULL
102+
vector_index_size bigint unsigned YES NULL NULL
103+
virtual_column_size bigint unsigned YES NULL NULL
104104
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for database 'nogrant'
105105
1
106106
0

tests/suites/0_stateless/18_rbac/18_0012_temp_table.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ ERROR 1105 (HY000) at line 1: UnknownTable. Code: 1025, Text = error:
2424
--> SQL:1:15
2525
|
2626
1 | select * from test.t2
27-
| ^^^^^^^ Unknown table "default".test.t2 .
27+
| ^^^^^^^ Unknown table "default"."test".t2 .
2828

2929
.

tests/suites/0_stateless/18_rbac/18_0013_column_privilege.result

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ t
1212
=== use db ===
1313
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for database 'system'
1414
=== show columns ===
15-
dummy TINYINT UNSIGNED NO NULL NULL
16-
c1 INT NO NULL NULL
17-
created_on TIMESTAMP NO NULL NULL
18-
inherited_roles BIGINT UNSIGNED NO NULL NULL
19-
inherited_roles_name VARCHAR NO NULL NULL
20-
name VARCHAR NO NULL NULL
21-
update_on TIMESTAMP NO NULL NULL
22-
keywords VARCHAR NO NULL NULL
23-
reserved TINYINT UNSIGNED NO NULL NULL
15+
dummy tinyint unsigned NO NULL NULL
16+
c1 int NO NULL NULL
17+
created_on timestamp NO NULL NULL
18+
inherited_roles bigint unsigned NO NULL NULL
19+
inherited_roles_name varchar(16382) NO NULL NULL
20+
name varchar(16382) NO NULL NULL
21+
update_on timestamp NO NULL NULL
22+
keywords varchar(16382) NO NULL NULL
23+
reserved tinyint unsigned NO NULL NULL
2424
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for database 'nogrant'
2525
Error: APIError: QueryFailed: [1063]Permission denied: User 'a'@'%' does not have the required privileges for table 'nogrant.t'
2626
=== grant system to a ===

tests/suites/0_stateless/18_rbac/18_0014_use_db_priv_check.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ t1
1010
t
1111
=== show columns ===
1212
Error: APIError: QueryFailed: [1063]Permission denied: User 'test'@'%' does not have the required privileges for table 'a.t'
13-
ida1 INT YES NULL NULL
14-
idb INT YES NULL NULL
13+
ida1 int YES NULL NULL
14+
idb int YES NULL NULL
1515
Error: APIError: QueryFailed: [1063]Permission denied: User 'test'@'%' does not have the required privileges for table 'b.t1'

0 commit comments

Comments
 (0)