cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1147 from Algunenano/find_cartodb

Browse Source 
Enforce the usage of cartodb schema
This commit is contained in:
Raúl Marín 2019-12-02 13:58:33 +01:00 committed by GitHub
commit 7e81618769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/map/analyses-catalog-controller.js
View File

@ -123,7 +123,7 @@ function unauthorizedError () {
} }
const catalogQueryTpl = ctx => ` const catalogQueryTpl = ctx => `
SELECT analysis_def->>'type' as type, * FROM cdb_analysis_catalog WHERE username = '${ctx._username}' SELECT analysis_def->>'type' as type, * FROM cartodb.cdb_analysis_catalog WHERE username = '${ctx._username}'
`; `;
var tablesQueryTpl = ctx => ` var tablesQueryTpl = ctx => `

2
lib/backends/analysis-status.js
View File

@ -10,7 +10,7 @@ module.exports = AnalysisStatusBackend;
AnalysisStatusBackend.prototype.getNodeStatus = function (nodeId, dbParams, callback) { AnalysisStatusBackend.prototype.getNodeStatus = function (nodeId, dbParams, callback) {
var statusQuery = [ var statusQuery = [
'SELECT node_id, status, updated_at, last_error_message as error_message', 'SELECT node_id, status, updated_at, last_error_message as error_message',
'FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\'' 'FROM cartodb.cdb_analysis_catalog where node_id = \'' + nodeId + '\''
].join(' '); ].join(' ');
var pg = new PSQL(dbParams); var pg = new PSQL(dbParams);