cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #652 from Algunenano/gdal23

Browse Source 
Gdal 2.3
This commit is contained in:
Raúl Marín 2020-04-17 11:04:12 +02:00 committed by GitHub
commit c529ac41ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ node_modules*
.idea/*
.vscode/
test/redis.pid
test/redis-server.log
test/test.log
test/acceptance/oauth/venv/*
coverage/

5
lib/models/formats/ogr.js
View File

@ -149,8 +149,9 @@ OgrFormat.prototype.toOGR = function (options, outFormat, outFilename, callback)
var ogrargs = [
'-f', outFormat,
'-lco', 'RESIZE=YES',
'-lco', 'ENCODING=UTF-8',
'-lco', 'RESIZE=YES', /* shapefile */
'-lco', 'ENCODING=UTF-8', /* shapefile */
'-lco', 'STRING_QUOTING=IF_NEEDED', /* csv: Match gdal 2.2 behaviour */
'-lco', 'LINEFORMAT=CRLF',
outFilename,
'PG:host=' + dbhost + ' port=' + dbport + ' user=' + dbuser + ' dbname=' + dbname + ' password=' + dbpass,

2
test/acceptance/cache-headers-test.js
View File

@ -67,7 +67,7 @@ describe('cache headers', function () {
assert.response(server, {
url: `/api/v1/sql?${qs.encode({
api_key: '1234',
q: `select CDB_TableMetadataTouch('${tableName}'::regclass)`
q: `select cartodb.CDB_TableMetadataTouch('${tableName}'::regclass)`
})}`,
headers: {
host: 'vizzuality.cartodb.com'

19
test/acceptance/export/csv-test.js
View File

@ -210,4 +210,23 @@ describe('export.csv', function () {
done();
});
});
it('maintains output compatible with gdal 2.2', function (done) {
assert.response(server, {
url: '/api/v1/sql?' + querystring.stringify({
q: 'SELECT cartodb_id, natscale, adm0cap from populated_places_simple_reduced limit 1',
format: 'csv'
}),
headers: { host: 'vizzuality.cartodb.com' },
method: 'GET'
},
{
status: 200
},
function (err, res) {
assert.ifError(err);
assert.strictEqual(res.body.split('\r\n')[1], '1109,20,0');
done();
});
});
});

2
test/acceptance/surrogate-key-test.js
View File

@ -92,7 +92,7 @@ describe('Surrogate-Key header', function () {
});
it('should not add header for CDB_QueryTables', function (done) {
var sql = "SELECT CDB_QueryTablesText('select * from untitle_table_4')";
var sql = "SELECT cartodb.CDB_QueryTablesText('select * from untitle_table_4')";
assert.response(server, createGetRequest(sql), RESPONSE_OK, function (err, res) {
assert.ifError(err);
assert.ok(!Object.prototype.hasOwnProperty.call(res, 'surrogate-key'), res.headers['surrogate-key']);

2
test/acceptance/x-cache-channel-test.js
View File

@ -93,7 +93,7 @@ describe('X-Cache-Channel header', function () {
});
it('should not add header for CDB_QueryTables', function (done) {
var sql = "SELECT CDB_QueryTablesText('select * from untitle_table_4')";
var sql = "SELECT cartodb.CDB_QueryTablesText('select * from untitle_table_4')";
assert.response(server, createGetRequest(sql), RESPONSE_OK, function (err, res) {
assert.ifError(err);
assert.ok(!Object.prototype.hasOwnProperty.call(res.headers, 'x-cache-channel'), res.headers['x-cache-channel']);