Skip to content

Commit 6aa489c

Browse files
committed
store: Make test postponed_indexes_with_block_column more specific
Test that the create index statements do/do not contain 'if not exists'
1 parent b27cc72 commit 6aa489c

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

store/postgres/src/relational/ddl_tests.rs

+14-5
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,15 @@ fn postponed_indexes_with_block_column() {
380380
);
381381
IndexList { indexes }
382382
}
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+
383392
// Names of the two indexes we are interested in. Not the leading space
384393
// to guard a little against overlapping names
385394
const BLOCK_IDX: &str = " data_block";
@@ -389,12 +398,12 @@ fn postponed_indexes_with_block_column() {
389398

390399
// Create everything
391400
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)));
394403

395404
// Defer attribute indexes
396405
let sql = layout.as_ddl(Some(index_list())).unwrap();
397-
assert!(sql.contains(BLOCK_IDX));
406+
assert!(sql.contains(&cr(BLOCK_IDX)));
398407
assert!(!sql.contains(ATTR_IDX));
399408
// This used to be duplicated
400409
let count = sql.matches(BLOCK_IDX).count();
@@ -404,7 +413,7 @@ fn postponed_indexes_with_block_column() {
404413
let sql = table.create_postponed_indexes(vec![], false);
405414
assert_eq!(1, sql.len());
406415
assert!(!sql[0].contains(BLOCK_IDX));
407-
assert!(sql[0].contains(ATTR_IDX));
416+
assert!(sql[0].contains(&cre(ATTR_IDX)));
408417

409418
let dst_nsp = Namespace::new("sgd2".to_string()).unwrap();
410419
let arr = index_list()
@@ -419,7 +428,7 @@ fn postponed_indexes_with_block_column() {
419428
.unwrap();
420429
assert_eq!(1, arr.len());
421430
assert!(!arr[0].1.contains(BLOCK_IDX));
422-
assert!(arr[0].1.contains(ATTR_IDX));
431+
assert!(arr[0].1.contains(&cr(ATTR_IDX)));
423432

424433
let arr = index_list()
425434
.indexes_for_table(

0 commit comments

Comments
 (0)