Merge "rdbms: fix some phpstorm warnings database classes"