From c021f5ebdc9d64a39e7e41e389ef645ecc6ba913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 31 Jul 2018 19:15:08 +0200 Subject: [PATCH 1/4] Upgrade camshaft to avoid missing columns when an analysis changes its schema output --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0a4274e1..c62a0052 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@carto/fqdn-sync": "0.2.2", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "0.62.1", + "camshaft": "cartodb/camshaft#calculate-columns-from-cached-query", "cartodb-psql": "0.11.0", "cartodb-query-tables": "0.3.0", "cartodb-redis": "2.0.1", diff --git a/yarn.lock b/yarn.lock index b3921822..f33f94ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -265,9 +265,9 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -camshaft@0.62.1: - version "0.62.1" - resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.62.1.tgz#75f8734c4089aaeae3b9067eb94d3c669cebbcaf" +camshaft@cartodb/camshaft#calculate-columns-from-cached-query: + version "0.62.2" + resolved "https://codeload.github.com/cartodb/camshaft/tar.gz/8d137ddf242a37c7973be099ad9f290071142824" dependencies: async "^1.5.2" bunyan "1.8.1" From 9c4adef0c227cac37ea8390ac912773b496a4173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 2 Aug 2018 15:57:39 +0200 Subject: [PATCH 2/4] Update camshaft to a released version --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c62a0052..10ddb8cb 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@carto/fqdn-sync": "0.2.2", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "cartodb/camshaft#calculate-columns-from-cached-query", + "camshaft": "0.62.2", "cartodb-psql": "0.11.0", "cartodb-query-tables": "0.3.0", "cartodb-redis": "2.0.1", diff --git a/yarn.lock b/yarn.lock index f33f94ca..354a0a65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -265,9 +265,9 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -camshaft@cartodb/camshaft#calculate-columns-from-cached-query: +camshaft@0.62.2: version "0.62.2" - resolved "https://codeload.github.com/cartodb/camshaft/tar.gz/8d137ddf242a37c7973be099ad9f290071142824" + resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.62.2.tgz#1d665b717a5a02ce44db8f7630cf23954929354a" dependencies: async "^1.5.2" bunyan "1.8.1" From f719813c5299646ac9946258357dfba4f525563d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 2 Aug 2018 16:09:39 +0200 Subject: [PATCH 3/4] Update NEWS --- NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 9c68466c..df6fd3ba 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,8 @@ ## 6.3.1 Released 2018-mm-dd - +- Upgrades Camshaft to [0.62.2](https://github.com/CartoDB/camshaft/releases/tag/0.61.11): + - Build query from node's cache to compute output columns when building analysis ## 6.3.0 Released 2018-07-26 From 45fc2dd07a00bf9a2b1f2d56e74f77d75a292067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 2 Aug 2018 16:19:12 +0200 Subject: [PATCH 4/4] Add empty line --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index df6fd3ba..ae75f88a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ ## 6.3.1 Released 2018-mm-dd + - Upgrades Camshaft to [0.62.2](https://github.com/CartoDB/camshaft/releases/tag/0.61.11): - Build query from node's cache to compute output columns when building analysis