fix for handling of SQL Server special case for unique constraint _hashed_ prefix

Author: cnathe

packages/components/src/internal/components/domainproperties/models.test.ts

@@ -1244,19 +1244,6 @@ describe('DomainIndex', () => {
         expect(index.isSingleFieldUniqueConstraint()).toBe(false);
     });
 
-    test('isMSSQLHashedSingleFieldUniqueConstraint', () => {
-        let index = DomainIndex.fromJS([{ columnNames: ['a'], unique: true } as IDomainIndex]).get(0);
-        expect(index.isMSSQLHashedSingleFieldUniqueConstraint()).toBe(false);
-        index = DomainIndex.fromJS([{ columnNames: ['a'], unique: false } as IDomainIndex]).get(0);
-        expect(index.isMSSQLHashedSingleFieldUniqueConstraint()).toBe(false);
-        index = DomainIndex.fromJS([{ columnNames: ['_hashed_a'], unique: true } as IDomainIndex]).get(0);
-        expect(index.isMSSQLHashedSingleFieldUniqueConstraint()).toBe(false);
-        index = DomainIndex.fromJS([{ columnNames: ['_hashed_a'], unique: false } as IDomainIndex]).get(0);
-        expect(index.isMSSQLHashedSingleFieldUniqueConstraint()).toBe(true);
-        index = DomainIndex.fromJS([{ columnNames: ['_hashed_a', 'b'], unique: false } as IDomainIndex]).get(0);
-        expect(index.isMSSQLHashedSingleFieldUniqueConstraint()).toBe(false);
-    });
-
     test('isSingleFieldNonUniqueConstraint', () => {
         let index = DomainIndex.fromJS([{ columnNames: ['a'], unique: false } as IDomainIndex]).get(0);
         expect(index.isSingleFieldNonUniqueConstraint()).toBe(true);

packages/components/src/internal/components/domainproperties/models.tsx

@@ -254,20 +254,19 @@ export class DomainDesign
                     .map(index => index.columns.get(0))
                     .toList();
 
-                // Hack: SQL server uses a hashed field for unique constraints on text columns, see
-                // BaseMicrosoftSqlServerDialect.addCreateIndexStatements (where it talks about HASHBYTES)
                 indices
-                    .filter(index => index.isMSSQLHashedSingleFieldUniqueConstraint())
+                    .filter(index => index.isSingleFieldNonUniqueConstraint())
                     .forEach(index => {
-                        uniqueConstraintFieldNames = uniqueConstraintFieldNames.push(
-                            index.columns.get(0).replace('_hashed_', '')
-                        );
+                        // Hack: SQL server uses a hashed field for unique constraints on text columns, see
+                        // BaseMicrosoftSqlServerDialect.addCreateIndexStatements (where it talks about HASHBYTES)
+                        if (index.columns.get(0).startsWith('_hashed_')) {
+                            uniqueConstraintFieldNames = uniqueConstraintFieldNames.push(
+                                index.columns.get(0).replace('_hashed_', '')
+                            );
+                        } else {
+                            nonUniqueConstraintFieldNames = nonUniqueConstraintFieldNames.push(index.columns.get(0));
+                        }
                     });
-
-                nonUniqueConstraintFieldNames = indices
-                    .filter(index => index.isSingleFieldNonUniqueConstraint())
-                    .map(index => index.columns.get(0))
-                    .toList();
             }
 
             if (rawModel.fields) {
@@ -314,7 +313,6 @@ export class DomainDesign
             .filter(
                 index =>
                     !index.isSingleFieldUniqueConstraint() &&
-                    !index.isMSSQLHashedSingleFieldUniqueConstraint() &&
                     !index.isSingleFieldNonUniqueConstraint()
             )
             .map(index => DomainIndex.serialize(index))
@@ -615,10 +613,6 @@ export class DomainIndex
         return this.type === 'unique' && this.columns.size === 1;
     }
 
-    isMSSQLHashedSingleFieldUniqueConstraint(): boolean {
-        return this.isSingleFieldNonUniqueConstraint() && this.columns.get(0).startsWith('_hashed_');
-    }
-
     isSingleFieldNonUniqueConstraint(): boolean {
         return this.type === 'nonunique' && this.columns.size === 1;
     }