Merge pull request #184 from heroku/fsre/version-check-works-with-tim…

…ing-off Fix bug when doing an version check with \timing on
heroku · Feb 21, 2022 · fd933c2 · fd933c2
2 parents c77299b + 1cd2138
commit fd933c2
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -26,15 +26,11 @@ function * ensureNonStarterPlan (db) {
 }
 
 function * newTotalExecTimeField (db) {
-  const newTotalExecTimeFieldQuery = 'SELECT current_setting(\'server_version_num\')::numeric >= 130000'
-  const newTotalExecTimeFieldRaw = yield pg.psql.exec(db, newTotalExecTimeFieldQuery)
+  const newTotalExecTimeFieldQuery = `SELECT current_setting('server_version_num')::numeric >= 130000`
+  const newTotalExecTimeFieldRaw = yield pg.psql.exec(db, newTotalExecTimeFieldQuery, ['-t', '-q'])
 
   // error checks
-  let newTotalExecTimeField = newTotalExecTimeFieldRaw.split('\n')
-  if (newTotalExecTimeField.length !== 6) {
-    throw new Error('Unable to determine database version')
-  }
-  newTotalExecTimeField = newTotalExecTimeFieldRaw.split('\n')[2].trim()
+  const newTotalExecTimeField = newTotalExecTimeFieldRaw.split("\n")[0].trim()
 
   if (newTotalExecTimeField !== 't' && newTotalExecTimeField !== 'f') {
     throw new Error(`Unable to determine database version, expected "t" or "f", got: "${newTotalExecTimeField}"`)