From 9c6d7c0ff9ef33c7da6a96e77ad69a78c34d97fe Mon Sep 17 00:00:00 2001
From: Javier Goizueta <jgoizueta@gmail.com>
Date: Thu, 20 Oct 2016 12:56:18 +0200
Subject: [PATCH] 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;