From 9c6d7c0ff9ef33c7da6a96e77ad69a78c34d97fe Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 20 Oct 2016 12:56:18 +0200 Subject: [PATCH 1/2] Upgrade camshaft to 0.46.0 This version of camshaft requires a CDB_CheckAnalysisQuota function to check analysis cache quota. --- package.json | 2 +- test/support/prepare_db.sh | 2 +- test/support/sql/cdb_analysis_check.sql | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 test/support/sql/cdb_analysis_check.sql diff --git a/package.json b/package.json index 1c8ff684..d158ae49 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ ], "dependencies": { "body-parser": "~1.14.0", - "camshaft": "0.45.0", + "camshaft": "0.46.0", "cartodb-psql": "~0.6.1", "cartodb-query-tables": "~0.1.0", "cartodb-redis": "0.13.1", diff --git a/test/support/prepare_db.sh b/test/support/prepare_db.sh index 393b05a9..1a6d929c 100755 --- a/test/support/prepare_db.sh +++ b/test/support/prepare_db.sh @@ -75,7 +75,7 @@ if test x"$PREPARE_PGSQL" = xyes; then dropdb "${TEST_DB}" createdb -Ttemplate_postgis -EUTF8 "${TEST_DB}" || die "Could not create test database" - LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced' + LOCAL_SQL_SCRIPTS='analysis_catalog windshaft.test gadm4 ported/populated_places_simple_reduced cdb_analysis_check' REMOTE_SQL_SCRIPTS='CDB_QueryStatements CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_OverviewsSupport CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins CDB_Hexagon CDB_XYZ' CURL_ARGS="" diff --git a/test/support/sql/cdb_analysis_check.sql b/test/support/sql/cdb_analysis_check.sql new file mode 100644 index 00000000..2b00e9d7 --- /dev/null +++ b/test/support/sql/cdb_analysis_check.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE FUNCTION CDB_CheckAnalysisQuota(table_name TEXT) +RETURNS void AS +$$ +BEGIN +END; +$$ LANGUAGE PLPGSQL; From 9805990d79a1d0328f86f98f9b88167ce932a100 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 20 Oct 2016 15:11:53 +0200 Subject: [PATCH 2/2] Update npm-shrinkwrap --- npm-shrinkwrap.json | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 21731795..01347882 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -80,7 +80,7 @@ }, "type-is": { "version": "1.6.13", - "from": "type-is@>=1.6.6 <1.7.0", + "from": "type-is@>=1.6.10 <1.7.0", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", "dependencies": { "media-typer": { @@ -90,7 +90,7 @@ }, "mime-types": { "version": "2.1.12", - "from": "mime-types@>=2.1.2 <2.2.0", + "from": "mime-types@>=2.1.11 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz", "dependencies": { "mime-db": { @@ -105,9 +105,9 @@ } }, "camshaft": { - "version": "0.45.0", - "from": "camshaft@0.45.0", - "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.45.0.tgz", + "version": "0.46.0", + "from": "camshaft@0.46.0", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.46.0.tgz", "dependencies": { "async": { "version": "1.5.2", @@ -164,9 +164,9 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "dependencies": { "inflight": { - "version": "1.0.5", + "version": "1.0.6", "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", @@ -250,9 +250,9 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { - "version": "1.4.1", + "version": "1.5.0", "from": "aws4@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz" }, "bl": { "version": "1.1.2", @@ -685,7 +685,7 @@ "dependencies": { "mime-types": { "version": "2.1.12", - "from": "mime-types@>=2.1.11 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz", "dependencies": { "mime-db": { @@ -915,7 +915,7 @@ }, "mime-types": { "version": "2.1.12", - "from": "mime-types@>=2.1.11 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz", "dependencies": { "mime-db": { @@ -1117,13 +1117,13 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz", "dependencies": { "async": { - "version": "2.0.1", + "version": "2.1.2", "from": "async@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz", "dependencies": { "lodash": { "version": "4.16.4", - "from": "lodash@>=4.8.0 <5.0.0", + "from": "lodash@>=4.14.0 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz" } } @@ -1367,6 +1367,7 @@ "turbo-carto": { "version": "0.18.0", "from": "turbo-carto@0.18.0", + "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.18.0.tgz", "dependencies": { "colorbrewer": { "version": "1.0.0",