@@ -2996,19 +2996,11 @@ impl SchemaApiTestSuite {
2996
2996
2997
2997
info ! ( "--- prepare db" ) ;
2998
2998
{
2999
- let plan = CreateDatabaseReq {
3000
- create_option : CreateOption :: Create ,
3001
- name_ident : DatabaseNameIdent :: new ( & tenant, db_name) ,
3002
- meta : DatabaseMeta {
3003
- engine : "" . to_string ( ) ,
3004
- ..DatabaseMeta :: default ( )
3005
- } ,
3006
- } ;
3007
-
3008
- let res = mt. create_database ( plan) . await ?;
3009
- info ! ( "create database res: {:?}" , res) ;
2999
+ let mut util = Util :: new ( mt, tenant_name, db_name, "" , "" ) ;
3000
+ util. create_db ( ) . await ?;
3001
+ info ! ( "create database res: {:?}" , ( ) ) ;
3010
3002
3011
- assert_eq ! ( 1 , * res . db_id, "first database id is 1" ) ;
3003
+ assert_eq ! ( 1 , * util . db_id( ) , "first database id is 1" ) ;
3012
3004
}
3013
3005
3014
3006
let created_on = Utc :: now ( ) ;
@@ -3356,19 +3348,11 @@ impl SchemaApiTestSuite {
3356
3348
3357
3349
info ! ( "--- prepare db" ) ;
3358
3350
{
3359
- let plan = CreateDatabaseReq {
3360
- create_option : CreateOption :: Create ,
3361
- name_ident : DatabaseNameIdent :: new ( & tenant, db_name) ,
3362
- meta : DatabaseMeta {
3363
- engine : "" . to_string ( ) ,
3364
- ..DatabaseMeta :: default ( )
3365
- } ,
3366
- } ;
3367
-
3368
- let res = mt. create_database ( plan) . await ?;
3369
- info ! ( "create database res: {:?}" , res) ;
3351
+ let mut util = Util :: new ( mt, tenant_name, db_name, "" , "" ) ;
3352
+ util. create_db ( ) . await ?;
3353
+ info ! ( "create database res: {:?}" , ( ) ) ;
3370
3354
3371
- assert_eq ! ( 1 , * res . db_id, "first database id is 1" ) ;
3355
+ assert_eq ! ( 1 , * util . db_id( ) , "first database id is 1" ) ;
3372
3356
}
3373
3357
3374
3358
let created_on = Utc :: now ( ) ;
@@ -4145,18 +4129,10 @@ impl SchemaApiTestSuite {
4145
4129
table_name : tb1_name. to_string ( ) ,
4146
4130
} ;
4147
4131
4148
- let plan = CreateDatabaseReq {
4149
- create_option : CreateOption :: Create ,
4150
- name_ident : DatabaseNameIdent :: new ( & tenant, db1_name) ,
4151
- meta : DatabaseMeta {
4152
- engine : "" . to_string ( ) ,
4153
- ..DatabaseMeta :: default ( )
4154
- } ,
4155
- } ;
4156
-
4157
- let res = mt. create_database ( plan) . await ?;
4158
- info ! ( "create database res: {:?}" , res) ;
4159
- let db_id = res. db_id ;
4132
+ let mut util = Util :: new ( mt, tenant_name, db1_name, "" , "" ) ;
4133
+ util. create_db ( ) . await ?;
4134
+ info ! ( "create database res: {:?}" , ( ) ) ;
4135
+ let db_id = util. db_id ( ) ;
4160
4136
4161
4137
let created_on = Utc :: now ( ) ;
4162
4138
let schema = || {
@@ -4878,18 +4854,9 @@ impl SchemaApiTestSuite {
4878
4854
info ! ( "--- create db1 tables" ) ;
4879
4855
{
4880
4856
let test_db_name = "db1" ;
4881
- let db_name = DatabaseNameIdent :: new ( & tenant, test_db_name) ;
4882
- let req = CreateDatabaseReq {
4883
- create_option : CreateOption :: Create ,
4884
- name_ident : db_name. clone ( ) ,
4885
- meta : DatabaseMeta {
4886
- engine : "" . to_string ( ) ,
4887
- ..DatabaseMeta :: default ( )
4888
- } ,
4889
- } ;
4890
-
4891
- let res = mt. create_database ( req) . await ?;
4892
- let db_id = res. db_id ;
4857
+ let mut util = Util :: new ( mt, tenant_name, test_db_name, "" , "" ) ;
4858
+ util. create_db ( ) . await ?;
4859
+ let db_id = util. db_id ( ) ;
4893
4860
4894
4861
let drop_ids =
4895
4862
create_dropped_table ( mt, tenant_name, test_db_name, * db_id, DEFAULT_MGET_SIZE + 1 )
@@ -4909,18 +4876,9 @@ impl SchemaApiTestSuite {
4909
4876
info ! ( "--- create db2 tables" ) ;
4910
4877
{
4911
4878
let test_db_name = "db2" ;
4912
- let db_name = DatabaseNameIdent :: new ( & tenant, test_db_name) ;
4913
- let req = CreateDatabaseReq {
4914
- create_option : CreateOption :: Create ,
4915
- name_ident : db_name. clone ( ) ,
4916
- meta : DatabaseMeta {
4917
- engine : "" . to_string ( ) ,
4918
- ..DatabaseMeta :: default ( )
4919
- } ,
4920
- } ;
4921
-
4922
- let res = mt. create_database ( req) . await ?;
4923
- let db_id = res. db_id ;
4879
+ let mut util = Util :: new ( mt, tenant_name, test_db_name, "" , "" ) ;
4880
+ util. create_db ( ) . await ?;
4881
+ let db_id = util. db_id ( ) ;
4924
4882
4925
4883
let drop_ids =
4926
4884
create_dropped_table ( mt, tenant_name, test_db_name, * db_id, DEFAULT_MGET_SIZE )
@@ -4938,18 +4896,9 @@ impl SchemaApiTestSuite {
4938
4896
info ! ( "--- create db3 tables" ) ;
4939
4897
{
4940
4898
let test_db_name = "db3" ;
4941
- let db_name = DatabaseNameIdent :: new ( & tenant, test_db_name) ;
4942
- let req = CreateDatabaseReq {
4943
- create_option : CreateOption :: Create ,
4944
- name_ident : db_name. clone ( ) ,
4945
- meta : DatabaseMeta {
4946
- engine : "" . to_string ( ) ,
4947
- ..DatabaseMeta :: default ( )
4948
- } ,
4949
- } ;
4950
-
4951
- let res = mt. create_database ( req) . await ?;
4952
- let db_id = res. db_id ;
4899
+ let mut util = Util :: new ( mt, tenant_name, test_db_name, "" , "" ) ;
4900
+ util. create_db ( ) . await ?;
4901
+ let db_id = util. db_id ( ) ;
4953
4902
4954
4903
let drop_ids = create_dropped_table ( mt, tenant_name, test_db_name, * db_id, 1 ) . await ?;
4955
4904
let case_drop_ids_vec = vec ! [ & mut case1_drop_ids, & mut case5_drop_ids] ;
@@ -5564,19 +5513,10 @@ impl SchemaApiTestSuite {
5564
5513
// use a new tenant and db do test
5565
5514
let db_name = "orphan_db" ;
5566
5515
let tenant_name = "orphan_tenant" ;
5567
- let tenant = Tenant :: new_or_err ( tenant_name, func_name ! ( ) ) ?;
5568
-
5569
- let plan = CreateDatabaseReq {
5570
- create_option : CreateOption :: Create ,
5571
- name_ident : DatabaseNameIdent :: new ( & tenant, db_name) ,
5572
- meta : DatabaseMeta {
5573
- engine : "" . to_string ( ) ,
5574
- ..DatabaseMeta :: default ( )
5575
- } ,
5576
- } ;
5577
-
5578
- let res = mt. create_database ( plan) . await ?;
5579
- let db_id = res. db_id ;
5516
+ let mut orphan_util = Util :: new ( mt, tenant_name, db_name, "" , "" ) ;
5517
+ orphan_util. create_db ( ) . await ?;
5518
+ let db_id = orphan_util. db_id ( ) ;
5519
+ let tenant = orphan_util. tenant ( ) ;
5580
5520
5581
5521
let create_table_req = CreateTableReq {
5582
5522
create_option : CreateOption :: CreateOrReplace ,
0 commit comments