From b7ff554209dc7a0fc90f8f0b511c21899ed573b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Mart=C3=ADnez?= Date: Thu, 11 Feb 2016 11:45:09 +0100 Subject: [PATCH] Use new _Updated_At function and new names --- lib/cartodb/api/query_tables_api.js | 2 +- lib/cartodb/cache/model/database_tables_entry.js | 4 ++-- test/acceptance/multilayer.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/api/query_tables_api.js b/lib/cartodb/api/query_tables_api.js index c32ace7f..a94d6411 100644 --- a/lib/cartodb/api/query_tables_api.js +++ b/lib/cartodb/api/query_tables_api.js @@ -30,7 +30,7 @@ QueryTablesApi.prototype.getAffectedTablesInQuery = function (username, sql, cal QueryTablesApi.prototype.getAffectedTablesAndLastUpdatedTime = function (username, sql, callback) { var query = - 'SELECT * FROM CDB_QueryTablesUpdatedAt($windshaft$' + prepareSql(sql) + '$windshaft$)'; + 'SELECT * FROM CDB_QueryTables_Updated_At($windshaft$' + prepareSql(sql) + '$windshaft$)'; this.pgQueryRunner.run(username, query, function handleAffectedTablesAndLastUpdatedTimeRows (err, rows) { if (err) { diff --git a/lib/cartodb/cache/model/database_tables_entry.js b/lib/cartodb/cache/model/database_tables_entry.js index 89bf88ab..60629714 100644 --- a/lib/cartodb/cache/model/database_tables_entry.js +++ b/lib/cartodb/cache/model/database_tables_entry.js @@ -10,13 +10,13 @@ module.exports = DatabaseTables; DatabaseTables.prototype.key = function() { return this.tables.map(function(table) { - return this.namespace + ':' + shortHashKey(table.db_name + ':' + table.table_name + '.' + table.schema_name); + return this.namespace + ':' + shortHashKey(table.dbname + ':' + table.table_name + '.' + table.schema_name); }.bind(this)); }; DatabaseTables.prototype.getCacheChannel = function() { var key = this.tables.map(function(table) { - return table.db_name + ':' + table.schema_name + "." + table.table_name; + return table.dbname + ':' + table.schema_name + "." + table.table_name; }).join(";;"); return key; }; diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js index d4eac5ef..2611bb7f 100644 --- a/test/acceptance/multilayer.js +++ b/test/acceptance/multilayer.js @@ -263,8 +263,8 @@ describe(suiteName, function() { expected_token = parsedBody.layergroupid.split(':')[0]; helper.checkCache(res); helper.checkSurrogateKey(res, new TablesCacheEntry([ - {db_name: "test_windshaft_cartodb_user_1_db", table_name: "test_table", schema_name: "public"}, - {db_name: "test_windshaft_cartodb_user_1_db", table_name: "test_table_2", schema_name: "public"}, + {dbname: "test_windshaft_cartodb_user_1_db", table_name: "test_table", schema_name: "public"}, + {dbname: "test_windshaft_cartodb_user_1_db", table_name: "test_table_2", schema_name: "public"}, ]).key().join(' '));