From 4826845bc053286fdfcb80a895c3a939ee732d3a Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Thu, 11 Jun 2020 23:58:48 +0200 Subject: [PATCH 1/7] Add travis --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..131443ef --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: node_js +node_js: + - node + - lts/* + +addons: + postgresql: '12' From 11aac70b5e8bb4ad214dc0e75df8c9ae39f727e4 Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:00:43 +0200 Subject: [PATCH 2/7] Add service correctly --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 131443ef..8e60fd44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ node_js: - node - lts/* -addons: - postgresql: '12' +services: + - postgresql From f2d497133b6b6c53e8e811e576821796d2a795ef Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:04:20 +0200 Subject: [PATCH 3/7] Make drop idempotent --- tests/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/index.js b/tests/index.js index 18e982c2..342fa92e 100644 --- a/tests/index.js +++ b/tests/index.js @@ -36,7 +36,7 @@ const options = { max: 1 } -cp.execSync('dropdb ' + options.db + ';createdb ' + options.db) +cp.execSync('dropdb --if-exists ' + options.db + ';createdb ' + options.db) ;[login, login_clear, login_md5, login_scram].forEach(x => cp.execSync('psql -c "grant all on database ' + options.db + ' to ' + x.user + '"') ) From 2fbade053c6e1e7a5c23d577fe6ff154117f146f Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:16:41 +0200 Subject: [PATCH 4/7] createuser --- tests/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/index.js b/tests/index.js index 342fa92e..bf50a57c 100644 --- a/tests/index.js +++ b/tests/index.js @@ -9,7 +9,8 @@ const postgres = require('../lib') const delay = ms => new Promise(r => setTimeout(r, ms)) const login = { - user: 'postgres_js_test' + user: 'postgres_js_test', + pass: '' } const login_clear = { @@ -38,7 +39,7 @@ const options = { cp.execSync('dropdb --if-exists ' + options.db + ';createdb ' + options.db) ;[login, login_clear, login_md5, login_scram].forEach(x => - cp.execSync('psql -c "grant all on database ' + options.db + ' to ' + x.user + '"') + cp.execSync('echo ' + x.pass + ' | createuser --pwprompt --superuser ' + x.user) ) const sql = postgres(options) From e474e61a066a0ba24025b5427d8911cd217cb10d Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:31:37 +0200 Subject: [PATCH 5/7] Set defaults --- tests/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/index.js b/tests/index.js index bf50a57c..cc05542d 100644 --- a/tests/index.js +++ b/tests/index.js @@ -38,8 +38,9 @@ const options = { } cp.execSync('dropdb --if-exists ' + options.db + ';createdb ' + options.db) + ;[login, login_clear, login_md5, login_scram].forEach(x => - cp.execSync('echo ' + x.pass + ' | createuser --pwprompt --superuser ' + x.user) + cp.execSync(`psql -d ${options.db} -c "CREATE ROLE ${x.user} PASSWORD '${x.pass}' SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN"`) ) const sql = postgres(options) From c190119a85a85c136ddbe321841a3f52025ed418 Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:33:42 +0200 Subject: [PATCH 6/7] Try newer version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e60fd44..ab168d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ node_js: - node - lts/* -services: - - postgresql +addons: + postgresql: "11.4" From bc2a9121b9e5e04dea6e4ffc3c2d0733bf7f846c Mon Sep 17 00:00:00 2001 From: Emil Bay Date: Fri, 12 Jun 2020 00:38:43 +0200 Subject: [PATCH 7/7] Newer --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab168d8d..0afd2cc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js +dist: xenial node_js: - node - lts/* -addons: - postgresql: "11.4" +services: + - postgresql