Adapt to refactoring of condition objects#425

Tigrov merged 3 commits intomasteryiisoft/db-pgsql:masterfrom

refactor-conditionyiisoft/db-pgsql:refactor-conditionCopy head branch name to clipboard