Merge origin/master

Author: brianc

.travis.yml

@@ -1,50 +1,51 @@
 language: node_js
-sudo: true
-dist: trusty
+dist: bionic
 
 before_script:
-  - node packages/pg/script/create-test-tables.js pg://[email protected]:5432/postgres
-
-before_install:
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
-    if [[ $(node -v) =~ v[1-9][0-9] ]]; then
-    source ./ci_scripts/build.sh;
-    fi
-    fi
+  - node script/create-test-tables.js pg://[email protected]:5432/postgres
 
 env:
   - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
 
+node_js:
+  - lts/dubnium
+  - lts/erbium
+  - 13
+
+addons:
+  postgresql: "10"
+
 matrix:
   include:
-    - node_js: "lts/boron"
-      addons:
-        postgresql: "9.6"
-    - node_js: "lts/argon"
-      addons:
-        postgresql: "9.6"
-    - node_js: "10"
-      addons:
-        postgresql: "9.6"
-    - node_js: "12"
+    - node_js: lts/boron
       addons:
-        postgresql: "9.6"
-    - node_js: "lts/carbon"
-      addons:
-        postgresql: "9.1"
+        postgresql: "9.5"
       dist: precise
-    - node_js: "lts/carbon"
+    - node_js: lts/carbon
       addons:
-        postgresql: "9.2"
-    - node_js: "lts/carbon"
+        postgresql: "9.5"
+      dist: precise
+
+    # different PostgreSQL versions on Node LTS
+    - node_js: lts/erbium
       addons:
         postgresql: "9.3"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.4"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.5"
-    - node_js: "lts/carbon"
+    - node_js: lts/erbium
       addons:
         postgresql: "9.6"
+
+    # PostgreSQL 9.1 and 9.2 only work on precise
+    - node_js: lts/carbon
+      addons:
+        postgresql: "9.1"
+      dist: precise
+    - node_js: lts/carbon
+      addons:
+        postgresql: "9.2"
+      dist: precise

ci_scripts/build.sh

@@ -38,15 +38,35 @@ var con = new pg.Client({
   password: args.password,
   database: args.database
 })
-con.connect()
-var query = con.query('drop table if exists person')
-con.query('create table person(id serial, name varchar(10), age integer)', (err, res) => {
-  console.log('Created table person')
-  console.log('Filling it with people')
-})
-people.map(function (person) {
-  return con.query(new pg.Query("insert into person(name, age) values('" + person.name + "', '" + person.age + "')"))
-}).pop().on('end', function () {
-  console.log('Inserted 26 people')
-  con.end()
+
+con.connect((err) => {
+  if (err) {
+    throw err
+  }
+
+  con.query(
+    'DROP TABLE IF EXISTS person;'
+    + ' CREATE TABLE person (id serial, name varchar(10), age integer)',
+    (err) => {
+      if (err) {
+        throw err
+      }
+
+      console.log('Created table person')
+      console.log('Filling it with people')
+
+      con.query(
+        'INSERT INTO person (name, age) VALUES'
+        + people
+          .map((person) => ` ('${person.name}', ${person.age})`)
+          .join(','),
+        (err, result) => {
+          if (err) {
+            throw err
+          }
+
+          console.log(`Inserted ${result.rowCount} people`)
+          con.end()
+        })
+    })
 })