Fix rebuildall.php fatal error with PostgreSQL

The fix for 47055 introduced a fatal error when running rebuildall.php. This
is a workaround suggested by gebhkla on Bugzilla (idle for 10+ days). It just
checks to make sure $options is actually an array before calling array_search
on it.

Bug: 60094
Change-Id: Ib54420b5a749c60b82a4757a9f5fa511f48fdb72
(cherry picked from commit afb297d175963d19735735c0283396a6cdcdf35a)
Avoid variable naming conflicts in DatabasePostgres::selectSQLText

Spotted by gebhkla on bug 60531

Bug: 60531
Change-Id: Iaf100ea0db05b142549bd98da108e48eae8b9101