Browse Source

Merge pull request #12305 from dashevchenko/constraintNameFix

Updated constraint name to valid one
pull/12324/head
Viacheslav Klimov 2 years ago
committed by GitHub
parent
commit
155c701822
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 11
      application/src/main/data/upgrade/basic/schema_update.sql
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java

11
application/src/main/data/upgrade/basic/schema_update.sql

@ -193,6 +193,17 @@ $$
END;
$$;
-- update constraint name
DO
$$
BEGIN
ALTER TABLE domain DROP CONSTRAINT IF EXISTS domain_unq_key;
IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'domain_name_key') THEN
ALTER TABLE domain ADD CONSTRAINT domain_name_key UNIQUE (name);
END IF;
END;
$$;
-- UPDATE RESOURCE JS_MODULE SUB TYPE START
UPDATE resource SET resource_sub_type = 'EXTENSION' WHERE resource_type = 'JS_MODULE' AND resource_sub_type IS NULL;

2
dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java

@ -67,7 +67,7 @@ public class DomainServiceImpl extends AbstractEntityService implements DomainSe
return savedDomain;
} catch (Exception e) {
checkConstraintViolation(e,
Map.of("domain_unq_key", "Domain with such name and scheme already exists!"));
Map.of("domain_name_key", "Domain with such name and scheme already exists!"));
throw e;
}
}

Loading…
Cancel
Save