r9109: changes for postgresql