Skip to content

Commit c53ddbc

Browse files
authored
Merge pull request #23 from observablehq/pg-8
Upgrade pg to 8 for node 14 support
2 parents 7696dac + c9260e8 commit c53ddbc

File tree

3 files changed

+37
-41
lines changed

3 files changed

+37
-41
lines changed

lib/postgres.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import {json} from "micro";
22
import {Pool} from "pg";
3-
import {parse} from "url";
43
import QueryStream from "pg-query-stream";
54
import JSONStream from "JSONStream";
65

76
export default url => {
8-
const {
9-
query: {sslmode}
10-
} = parse(url, true);
11-
const pool = new Pool({connectionString: url, ssl: !!sslmode});
7+
const pool = new Pool({connectionString: url});
128

139
return async function query(req, res) {
1410
const {sql, params} = await json(req);

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"micro": "^9.3.4",
1212
"mysql": "^2.17.1",
1313
"open": "^6.3.0",
14-
"pg": "^7.11.0",
15-
"pg-query-stream": "^2.0.0",
14+
"pg": "^8.7.1",
15+
"pg-query-stream": "^4.2.1",
1616
"serialize-error": "^4.1.0",
1717
"snowflake-sdk": "^1.5.0",
1818
"yargs": "^13.2.4"

yarn.lock

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,56 +1909,61 @@ performance-now@^2.1.0:
19091909
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
19101910
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
19111911

1912-
pg-connection-string@0.1.3:
1913-
version "0.1.3"
1914-
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
1915-
integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
1912+
pg-connection-string@^2.5.0:
1913+
version "2.5.0"
1914+
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
1915+
integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
19161916

1917-
pg-cursor@2.0.0:
1918-
version "2.0.0"
1919-
resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.0.0.tgz#1e11532613d2d4c61057a5705a1536b1052d1698"
1920-
integrity sha512-/gYHadqLurektHk6HXiL0hSrn+RZfowkLr+ftC0lLoLBlIm8JIdk9f9g71EEjK63XxqhFqcykHuxQLFzSeyzdQ==
1917+
pg-cursor@^2.7.1:
1918+
version "2.7.1"
1919+
resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.7.1.tgz#0c545b70006589537232986fa06c03a799d8f22b"
1920+
integrity sha512-dtxtyvx4BcSammddki27KPBVA0sZ8AguLabgs7++gqaefX7dlQ5zaRlk1Gi5mvyO25aCmHFAZyNq9zYtPDwFTA==
19211921

19221922
19231923
version "1.0.1"
19241924
resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
19251925
integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
19261926

1927-
pg-pool@^2.0.4:
1928-
version "2.0.6"
1929-
resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.6.tgz#7b561a482feb0a0e599b58b5137fd2db3ad8111c"
1930-
integrity sha512-hod2zYQxM8Gt482q+qONGTYcg/qVcV32VHVPtktbBJs0us3Dj7xibISw0BAAXVMCzt8A/jhfJvpZaxUlqtqs0g==
1927+
pg-pool@^3.4.1:
1928+
version "3.4.1"
1929+
resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c"
1930+
integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==
19311931

1932-
pg-query-stream@^2.0.0:
1933-
version "2.0.0"
1934-
resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-2.0.0.tgz#f9536ad207bfa9780cc5e0183bc6434d1a824be5"
1935-
integrity sha512-EInD7AOhnJVFIgN8BSEbKA6MKyn20dDGPsJEuhxiNaWpmveNgnmn3W1BmYm9pa6LakioR/WTi7ecWA44GBRKig==
1932+
pg-protocol@^1.5.0:
1933+
version "1.5.0"
1934+
resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0"
1935+
integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==
1936+
1937+
pg-query-stream@^4.2.1:
1938+
version "4.2.1"
1939+
resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-4.2.1.tgz#e69d8c9a3cc5aa43d0943bdee63dfb2af9763c36"
1940+
integrity sha512-8rOjGPgerzYmfRnX/EYhWiI7OVI17BGM3PxsI8o/Ot8IDyFMy8cf2xG5S9XpVPgkAjBs8c47vSclKuJqlN2c9g==
19361941
dependencies:
1937-
pg-cursor "2.0.0"
1942+
pg-cursor "^2.7.1"
19381943

1939-
pg-types@~2.0.0:
1940-
version "2.0.1"
1941-
resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.0.1.tgz#b8585a37f2a9c7b386747e44574799549e5f4933"
1942-
integrity sha512-b7y6QM1VF5nOeX9ukMQ0h8a9z89mojrBHXfJeSug4mhL0YpxNBm83ot2TROyoAmX/ZOX3UbwVO4EbH7i1ZZNiw==
1944+
pg-types@^2.1.0:
1945+
version "2.2.0"
1946+
resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
1947+
integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
19431948
dependencies:
19441949
pg-int8 "1.0.1"
19451950
postgres-array "~2.0.0"
19461951
postgres-bytea "~1.0.0"
19471952
postgres-date "~1.0.4"
19481953
postgres-interval "^1.1.0"
19491954

1950-
pg@^7.11.0:
1951-
version "7.11.0"
1952-
resolved "https://registry.yarnpkg.com/pg/-/pg-7.11.0.tgz#a8b9ae9cf19199b7952b72957573d0a9c5e67c0c"
1953-
integrity sha512-YO4V7vCmEMGoF390LJaFaohWNKaA2ayoQOEZmiHVcAUF+YsRThpf/TaKCgSvsSE7cDm37Q/Cy3Gz41xiX/XjTw==
1955+
pg@^8.7.1:
1956+
version "8.7.1"
1957+
resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471"
1958+
integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==
19541959
dependencies:
19551960
buffer-writer "2.0.0"
19561961
packet-reader "1.0.0"
1957-
pg-connection-string "0.1.3"
1958-
pg-pool "^2.0.4"
1959-
pg-types "~2.0.0"
1962+
pg-connection-string "^2.5.0"
1963+
pg-pool "^3.4.1"
1964+
pg-protocol "^1.5.0"
1965+
pg-types "^2.1.0"
19601966
pgpass "1.x"
1961-
semver "4.3.2"
19621967

19631968
19641969
version "1.0.2"
@@ -2231,11 +2236,6 @@ semver-diff@^2.0.0:
22312236
dependencies:
22322237
semver "^5.0.3"
22332238

2234-
2235-
version "4.3.2"
2236-
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
2237-
integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
2238-
22392239
semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
22402240
version "5.7.0"
22412241
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"

0 commit comments

Comments
 (0)