Redo PostgreSQL scripts to catch the corrections for RowCount checking