cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pgcopy-stream

Browse Source
This commit is contained in:
Simon Martín 2018-06-08 10:54:41 +02:00
commit 0ee86029cf
3 changed files with 89 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS.md
View File

@ -4,8 +4,11 @@
Released 2018-mm-dd Released 2018-mm-dd
New features: New features:
- CI tests with Ubuntu Xenial + PostgreSQL 10.1 and Ubuntu Precise + PostgreSQL 9.5 * CI tests with Ubuntu Xenial + PostgreSQL 10.1 and Ubuntu Precise + PostgreSQL 9.5
- Making version 2.0.0 configuration parameters backwards compatible * Making version 2.0.0 configuration parameters backwards compatible
Announcements:
* Updated carto-psql to 0.12.0
## 2.0.0 ## 2.0.0

126
npm-shrinkwrap.json generated
View File

@ -93,6 +93,11 @@
"from": "isarray@>=1.0.0 <1.1.0", "from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
}, },
"process-nextick-args": {
"version": "1.0.7",
"from": "process-nextick-args@>=1.0.6 <1.1.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
},
"readable-stream": { "readable-stream": {
"version": "2.0.6", "version": "2.0.6",
"from": "readable-stream@>=2.0.5 <2.1.0", "from": "readable-stream@>=2.0.5 <2.1.0",
@ -116,9 +121,9 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
}, },
"buffer-from": { "buffer-from": {
"version": "1.0.0", "version": "1.1.0",
"from": "buffer-from@>=1.0.0 <2.0.0", "from": "buffer-from@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz" "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"
}, },
"buffer-writer": { "buffer-writer": {
"version": "1.0.1", "version": "1.0.1",
@ -137,8 +142,15 @@
}, },
"busboy": { "busboy": {
"version": "0.2.14", "version": "0.2.14",
"from": "busboy@>=0.2.14 <0.3.0", "from": "busboy@>=0.2.11 <0.3.0",
"resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz" "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz",
"dependencies": {
"readable-stream": {
"version": "1.1.14",
"from": "readable-stream@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
}
}
}, },
"camelcase": { "camelcase": {
"version": "3.0.0", "version": "3.0.0",
@ -146,9 +158,16 @@
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
}, },
"cartodb-psql": { "cartodb-psql": {
"version": "0.10.1", "version": "0.12.0",
"from": "cartodb-psql@0.10.1", "from": "cartodb-psql@0.12.0",
"resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.10.1.tgz" "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.12.0.tgz",
"dependencies": {
"debug": {
"version": "3.1.0",
"from": "debug@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"
}
}
}, },
"cartodb-query-tables": { "cartodb-query-tables": {
"version": "0.2.0", "version": "0.2.0",
@ -205,11 +224,6 @@
"from": "isarray@>=1.0.0 <1.1.0", "from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
}, },
"process-nextick-args": {
"version": "2.0.0",
"from": "process-nextick-args@>=2.0.0 <2.1.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"
},
"readable-stream": { "readable-stream": {
"version": "2.3.6", "version": "2.3.6",
"from": "readable-stream@>=2.2.2 <3.0.0", "from": "readable-stream@>=2.2.2 <3.0.0",
@ -267,7 +281,14 @@
"debug": { "debug": {
"version": "2.2.0", "version": "2.2.0",
"from": "debug@2.2.0", "from": "debug@2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"dependencies": {
"ms": {
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
}
}
}, },
"decamelize": { "decamelize": {
"version": "1.2.0", "version": "1.2.0",
@ -292,7 +313,14 @@
"dicer": { "dicer": {
"version": "0.2.5", "version": "0.2.5",
"from": "dicer@0.2.5", "from": "dicer@0.2.5",
"resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz" "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz",
"dependencies": {
"readable-stream": {
"version": "1.1.14",
"from": "readable-stream@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
}
}
}, },
"dot": { "dot": {
"version": "1.0.3", "version": "1.0.3",
@ -604,11 +632,6 @@
"from": "cartodb/log4js-node#cdb", "from": "cartodb/log4js-node#cdb",
"resolved": "git://github.com/cartodb/log4js-node.git#145d5f91e35e7fb14a6278cbf7a711ced6603727", "resolved": "git://github.com/cartodb/log4js-node.git#145d5f91e35e7fb14a6278cbf7a711ced6603727",
"dependencies": { "dependencies": {
"readable-stream": {
"version": "1.0.34",
"from": "readable-stream@>=1.0.2 <1.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
},
"semver": { "semver": {
"version": "4.3.6", "version": "4.3.6",
"from": "semver@>=4.3.3 <4.4.0", "from": "semver@>=4.3.3 <4.4.0",
@ -672,15 +695,15 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
}, },
"moment": { "moment": {
"version": "2.22.1", "version": "2.22.2",
"from": "moment@>=2.10.6 <3.0.0", "from": "moment@>=2.10.6 <3.0.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"optional": true "optional": true
}, },
"ms": { "ms": {
"version": "0.7.1", "version": "2.0.0",
"from": "ms@0.7.1", "from": "ms@2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
}, },
"multer": { "multer": {
"version": "1.2.1", "version": "1.2.1",
@ -779,9 +802,9 @@
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz" "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
}, },
"packet-reader": { "packet-reader": {
"version": "0.2.0", "version": "0.3.1",
"from": "packet-reader@0.2.0", "from": "packet-reader@0.3.1",
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz" "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz"
}, },
"parse-json": { "parse-json": {
"version": "2.2.0", "version": "2.2.0",
@ -814,9 +837,9 @@
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz" "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
}, },
"pg": { "pg": {
"version": "6.1.6", "version": "6.4.2",
"from": "cartodb/node-postgres#6.1.6-cdb1", "from": "cartodb/node-postgres#6.4.2-cdb1",
"resolved": "git://github.com/cartodb/node-postgres.git#3eef52dd1e655f658a4ee8ac5697688b3ecfed44" "resolved": "git://github.com/cartodb/node-postgres.git#449fac1d6da711ffcc6694ae3c89f85244f48bdc"
}, },
"pg-connection-string": { "pg-connection-string": {
"version": "0.1.3", "version": "0.1.3",
@ -884,9 +907,9 @@
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz" "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz"
}, },
"process-nextick-args": { "process-nextick-args": {
"version": "1.0.7", "version": "2.0.0",
"from": "process-nextick-args@>=1.0.6 <1.1.0", "from": "process-nextick-args@>=2.0.0 <2.1.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"
}, },
"proxy-addr": { "proxy-addr": {
"version": "1.0.10", "version": "1.0.10",
@ -924,9 +947,9 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
}, },
"readable-stream": { "readable-stream": {
"version": "1.1.14", "version": "1.0.34",
"from": "readable-stream@>=1.1.0 <1.2.0", "from": "readable-stream@>=1.0.2 <1.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
}, },
"redis": { "redis": {
"version": "2.8.0", "version": "2.8.0",
@ -987,11 +1010,16 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
}, },
"safe-json-stringify": { "safe-json-stringify": {
"version": "1.1.0", "version": "1.2.0",
"from": "safe-json-stringify@>=1.0.0 <2.0.0", "from": "safe-json-stringify@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz", "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
"optional": true "optional": true
}, },
"safer-buffer": {
"version": "2.1.2",
"from": "safer-buffer@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
},
"semver": { "semver": {
"version": "4.3.2", "version": "4.3.2",
"from": "semver@4.3.2", "from": "semver@4.3.2",
@ -1000,13 +1028,25 @@
"send": { "send": {
"version": "0.13.1", "version": "0.13.1",
"from": "send@0.13.1", "from": "send@0.13.1",
"resolved": "https://registry.npmjs.org/send/-/send-0.13.1.tgz" "resolved": "https://registry.npmjs.org/send/-/send-0.13.1.tgz",
"dependencies": {
"ms": {
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
}
}
}, },
"serve-static": { "serve-static": {
"version": "1.10.3", "version": "1.10.3",
"from": "serve-static@>=1.10.2 <1.11.0", "from": "serve-static@>=1.10.2 <1.11.0",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz",
"dependencies": { "dependencies": {
"ms": {
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
},
"send": { "send": {
"version": "0.13.2", "version": "0.13.2",
"from": "send@0.13.2", "from": "send@0.13.2",
@ -1050,9 +1090,9 @@
"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz" "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz"
}, },
"sshpk": { "sshpk": {
"version": "1.14.1", "version": "1.14.2",
"from": "sshpk@>=1.7.0 <2.0.0", "from": "sshpk@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
"dependencies": { "dependencies": {
"assert-plus": { "assert-plus": {
"version": "1.0.0", "version": "1.0.0",
@ -1092,9 +1132,9 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
}, },
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.6",
"from": "stringstream@>=0.0.4 <0.1.0", "from": "stringstream@>=0.0.4 <0.1.0",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz"
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",

2
package.json
View File

@ -20,7 +20,7 @@
"basic-auth": "^2.0.0", "basic-auth": "^2.0.0",
"bintrees": "1.0.1", "bintrees": "1.0.1",
"bunyan": "1.8.1", "bunyan": "1.8.1",
"cartodb-psql": "0.10.1", "cartodb-psql": "0.12.0",
"cartodb-query-tables": "0.2.0", "cartodb-query-tables": "0.2.0",
"cartodb-redis": "1.0.0", "cartodb-redis": "1.0.0",
"debug": "2.2.0", "debug": "2.2.0",