@@ -380,6 +380,15 @@ fn postponed_indexes_with_block_column() {
380
380
) ;
381
381
IndexList { indexes }
382
382
}
383
+
384
+ fn cr ( index : & str ) -> String {
385
+ format ! ( "create index{}" , index)
386
+ }
387
+
388
+ fn cre ( index : & str ) -> String {
389
+ format ! ( "create index if not exists{}" , index)
390
+ }
391
+
383
392
// Names of the two indexes we are interested in. Not the leading space
384
393
// to guard a little against overlapping names
385
394
const BLOCK_IDX : & str = " data_block" ;
@@ -389,12 +398,12 @@ fn postponed_indexes_with_block_column() {
389
398
390
399
// Create everything
391
400
let sql = layout. as_ddl ( None ) . unwrap ( ) ;
392
- assert ! ( sql. contains( BLOCK_IDX ) ) ;
393
- assert ! ( sql. contains( ATTR_IDX ) ) ;
401
+ assert ! ( sql. contains( & cr ( BLOCK_IDX ) ) ) ;
402
+ assert ! ( sql. contains( & cr ( ATTR_IDX ) ) ) ;
394
403
395
404
// Defer attribute indexes
396
405
let sql = layout. as_ddl ( Some ( index_list ( ) ) ) . unwrap ( ) ;
397
- assert ! ( sql. contains( BLOCK_IDX ) ) ;
406
+ assert ! ( sql. contains( & cr ( BLOCK_IDX ) ) ) ;
398
407
assert ! ( !sql. contains( ATTR_IDX ) ) ;
399
408
// This used to be duplicated
400
409
let count = sql. matches ( BLOCK_IDX ) . count ( ) ;
@@ -404,7 +413,7 @@ fn postponed_indexes_with_block_column() {
404
413
let sql = table. create_postponed_indexes ( vec ! [ ] , false ) ;
405
414
assert_eq ! ( 1 , sql. len( ) ) ;
406
415
assert ! ( !sql[ 0 ] . contains( BLOCK_IDX ) ) ;
407
- assert ! ( sql[ 0 ] . contains( ATTR_IDX ) ) ;
416
+ assert ! ( sql[ 0 ] . contains( & cre ( ATTR_IDX ) ) ) ;
408
417
409
418
let dst_nsp = Namespace :: new ( "sgd2" . to_string ( ) ) . unwrap ( ) ;
410
419
let arr = index_list ( )
@@ -419,7 +428,7 @@ fn postponed_indexes_with_block_column() {
419
428
. unwrap ( ) ;
420
429
assert_eq ! ( 1 , arr. len( ) ) ;
421
430
assert ! ( !arr[ 0 ] . 1 . contains( BLOCK_IDX ) ) ;
422
- assert ! ( arr[ 0 ] . 1 . contains( ATTR_IDX ) ) ;
431
+ assert ! ( arr[ 0 ] . 1 . contains( & cr ( ATTR_IDX ) ) ) ;
423
432
424
433
let arr = index_list ( )
425
434
. indexes_for_table (
0 commit comments