From ab66ad83fd5211ef9ae0a3f5585ae0d4984ec4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Thu, 28 Nov 2019 18:07:44 +0100
Subject: [PATCH] Exec psql commands in batches

---
 test/index.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/test/index.js b/test/index.js
index 892b6fed..f0e8c2c8 100644
--- a/test/index.js
+++ b/test/index.js
@@ -65,24 +65,22 @@ async function populateDatabase () {
         'ported/populated_places_simple_reduced',
         'cdb_analysis_check',
         'cdb_invalidate_varnish'
-    ];
+    ].map(filename => `${__dirname}/support/sql/${filename}.sql`);
 
-    for (const filename of filenames) {
-        const populateDatabaseCmd = `
-            cat ${__dirname}/support/sql/${filename}.sql |
-            sed -e "s/:PUBLICUSER/${PUBLIC_USER}/g" |
-            sed -e "s/:PUBLICPASS/${PUBLIC_USER_PASSWORD}/g" |
-            sed -e "s/:TESTUSER/${TEST_USER}/g" |
-            sed -e "s/:TESTPASS/${TEST_PASSWORD}/g" |
-            PGOPTIONS='--client-min-messages=WARNING' psql -q -v ON_ERROR_STOP=1 ${TEST_DB}
-        `;
+    const populateDatabaseCmd = `
+        cat ${filenames.join(' ')} |
+        sed -e "s/:PUBLICUSER/${PUBLIC_USER}/g" |
+        sed -e "s/:PUBLICPASS/${PUBLIC_USER_PASSWORD}/g" |
+        sed -e "s/:TESTUSER/${TEST_USER}/g" |
+        sed -e "s/:TESTPASS/${TEST_PASSWORD}/g" |
+        PGOPTIONS='--client-min-messages=WARNING' psql -q -v ON_ERROR_STOP=1 ${TEST_DB}
+    `;
 
-        await exec(populateDatabaseCmd, {
-            env: {
-                PGUSER: 'postgres'
-            }
-        });
-    }
+    await exec(populateDatabaseCmd, {
+        env: {
+            PGUSER: 'postgres'
+        }
+    });
 }
 
 async function populateRedis () {