Add dictionary.match control

22 files changed, 132 insertions, 0 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index 641e2d8fde5..760d39b8f55 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
index bb4ba665406..951cd8e4157 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -32,6 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index d05d2d1d5e0..1700cc5ff32 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT8
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT8
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype INT64
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -264,6 +273,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -293,6 +303,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -322,6 +333,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -351,6 +363,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -380,6 +393,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -409,6 +423,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -438,6 +453,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -467,6 +483,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -496,6 +513,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index e9f3f68adc1..632ab97bbfe 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -264,6 +273,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -293,6 +303,7 @@ attribute[].datatype INT64
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -322,6 +333,7 @@ attribute[].datatype DOUBLE
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -351,6 +363,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -380,6 +393,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -409,6 +423,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -438,6 +453,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -467,6 +483,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -496,6 +513,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index 622fb9f349c..8bfc14e6795 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index 4d275787bfd..188ebed6bc2 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
index bfdf90ac12c..f2a18de22bf 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg
index f1b20c6e454..0433c41fced 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
index 9e0b5f18170..894683e6389 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -119,6 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -148,6 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -206,6 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index 68cd917336f..16ddd67ad6d 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index a931af7af4d..900a93efe23 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index 11498de54b1..93dfc9b3234 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index acbdf119d0d..35b9a1722a9 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
index ecc8c2fd69d..e9471d91c45 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index a31325e67d0..e1685f55357 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -264,6 +273,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -293,6 +303,7 @@ attribute[].datatype STRING
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 68f24871f02..0b3c39c44f6 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -264,6 +273,7 @@ attribute[].datatype INT32
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index ff45cf1a41e..52ad169550d 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype PREDICATE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index f9878068372..a0657f5bc27 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index ad3ff5e62f8..1517a96950c 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype REFERENCE
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index ebe0e83540e..e878c1f054f 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype STRING
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index 398cdf5f8f8..71789c2987c 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype TENSOR
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype FLOAT
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index 05e19a15d96..e48d4d1bd09 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -3,6 +3,7 @@ attribute[].datatype INT8
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -32,6 +33,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -61,6 +63,7 @@ attribute[].datatype BOOL
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -90,6 +93,7 @@ attribute[].datatype FLOAT16
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -119,6 +123,7 @@ attribute[].datatype INT32
 attribute[].collectiontype ARRAY
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -148,6 +153,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -177,6 +183,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -206,6 +213,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent false
 attribute[].fastsearch false
@@ -235,6 +243,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -264,6 +273,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -293,6 +303,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch true
@@ -322,6 +333,7 @@ attribute[].datatype STRING
 attribute[].collectiontype WEIGHTEDSET
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero true
 attribute[].createifnonexistent true
 attribute[].fastsearch false
@@ -351,6 +363,7 @@ attribute[].datatype INT64
 attribute[].collectiontype SINGLE
 attribute[].dictionary.ordering ORDERED
 attribute[].dictionary.type BTREE
+attribute[].dictionary.match CASE_INSENSITIVE
 attribute[].removeifzero false
 attribute[].createifnonexistent false
 attribute[].fastsearch false