From 2eea20b1616c55edabde34fdcb3ba5de12c19d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 5 Nov 2018 16:03:43 +0100 Subject: [PATCH] Updated cartodb-psql --- package-lock.json | 63 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bddbf20..2ff0c876 100644 --- a/package-lock.json +++ b/package-lock.json @@ -315,6 +315,29 @@ "request": "2.85.0" }, "dependencies": { + "cartodb-psql": { + "version": "github:cartodb/node-cartodb-psql#398e16b72d13d7ed90dc513e40218ff72653c310", + "from": "github:cartodb/node-cartodb-psql#nodejs-10", + "requires": { + "debug": "^3.1.0", + "pg": "github:CartoDB/node-postgres#449fac1d6da711ffcc6694ae3c89f85244f48bdc", + "underscore": "~1.6.0" + } + }, + "pg": { + "version": "github:CartoDB/node-postgres#449fac1d6da711ffcc6694ae3c89f85244f48bdc", + "from": "github:CartoDB/node-postgres#449fac1d6da711ffcc6694ae3c89f85244f48bdc", + "requires": { + "buffer-writer": "1.0.1", + "js-string-escape": "1.0.1", + "packet-reader": "0.3.1", + "pg-connection-string": "0.1.3", + "pg-pool": "1.*", + "pg-types": "1.*", + "pgpass": "1.*", + "semver": "4.3.2" + } + }, "request": { "version": "2.85.0", "resolved": "http://registry.npmjs.org/request/-/request-2.85.0.tgz", @@ -343,6 +366,11 @@ "tunnel-agent": "^0.6.0", "uuid": "^3.1.0" } + }, + "semver": { + "version": "4.3.2", + "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz", + "integrity": "sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=" } } }, @@ -378,11 +406,11 @@ } }, "cartodb-psql": { - "version": "github:cartodb/node-cartodb-psql#398e16b72d13d7ed90dc513e40218ff72653c310", + "version": "github:cartodb/node-cartodb-psql#cd7328ce0ef77c3c17227b706f7862ff5b2951a3", "from": "github:cartodb/node-cartodb-psql#nodejs-10", "requires": { "debug": "^3.1.0", - "pg": "github:CartoDB/node-postgres#449fac1d6da711ffcc6694ae3c89f85244f48bdc", + "pg": "github:cartodb/node-postgres#37e731940bccd2d8c001b5b69e2229d09cd057d0", "underscore": "~1.6.0" } }, @@ -403,6 +431,21 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/dot/-/dot-1.0.3.tgz", "integrity": "sha1-+HUL+2sDx2ZOsObLHrTGZBmvlCc=" + }, + "generic-pool": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", + "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0=" + }, + "redis-mpool": { + "version": "github:cartodb/node-redis-mpool#b8aed387cbfa1a3ed00417a451d6abec59801cde", + "from": "github:cartodb/node-redis-mpool#nodejs-10", + "requires": { + "generic-pool": "~2.1.1", + "hiredis": "~0.5.0", + "redis": "^2.8.0", + "underscore": "~1.6.0" + } } } }, @@ -1576,9 +1619,9 @@ } }, "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + "version": "4.1.15", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", + "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, "graceful-readlink": { "version": "1.0.1", @@ -2808,8 +2851,8 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pg": { - "version": "github:CartoDB/node-postgres#449fac1d6da711ffcc6694ae3c89f85244f48bdc", - "from": "github:CartoDB/node-postgres#6.4.2-cdb1", + "version": "github:cartodb/node-postgres#37e731940bccd2d8c001b5b69e2229d09cd057d0", + "from": "github:cartodb/node-postgres#nodejs-10", "requires": { "buffer-writer": "1.0.1", "js-string-escape": "1.0.1", @@ -3649,7 +3692,7 @@ }, "turbo-carto": { "version": "0.19.0", - "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz", + "resolved": "http://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz", "integrity": "sha1-g/sZMqzUKstCYxLu8ha19qw0cI4=", "requires": { "cartocolor": "4.0.0", @@ -3828,7 +3871,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#51f95e77d23ac4c2f68ce7ac23e6fc3098ad8131", + "version": "github:cartodb/windshaft#eeab518fd51871f6730d51c0b907e82d7eff3705", "from": "github:cartodb/windshaft#nodejs-10", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -3836,7 +3879,7 @@ "abaculus": "github:cartodb/abaculus#4dc05ba2e91697ed5fc68734ffa3ffb46290c942", "canvas": "github:cartodb/node-canvas#232053066f3b0e711113d4a5af042a1a448199cd", "carto": "github:cartodb/carto#161516b7211d4be6bf401ab1957cb5cebc139f81", - "cartodb-psql": "github:cartodb/node-cartodb-psql#398e16b72d13d7ed90dc513e40218ff72653c310", + "cartodb-psql": "github:cartodb/node-cartodb-psql#cd7328ce0ef77c3c17227b706f7862ff5b2951a3", "debug": "3.1.0", "dot": "1.1.2", "grainstore": "github:cartodb/grainstore#e9828cc7f2777b7af61b7328269f32fdb5fb6b42",