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

Merge branch 'master' into node-v6

Browse Source
This commit is contained in:
Raul Ochoa 2017-01-12 19:49:56 +01:00
commit d48a901533
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS.md
View File

@ -1,7 +1,14 @@
#Changelog #Changelog
## 1.42.8
Released 2017-mm-dd
## 1.42.7 ## 1.42.7
Released 2016-mm-dd Released 2017-01-12
Enhancements:
* Avoid gpkg fid column #404.
Announcements: Announcements:
* Upgrade cartodb-psql to 0.7.0. * Upgrade cartodb-psql to 0.7.0.

12
app/models/formats/ogr.js
View File

@ -60,10 +60,10 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
var ogr2ogr = global.settings.ogr2ogrCommand || 'ogr2ogr'; var ogr2ogr = global.settings.ogr2ogrCommand || 'ogr2ogr';
var dbhost = dbopts.host; var dbhost = dbopts.host;
var dbport = dbopts.port; var dbport = dbopts.port;
var dbuser = dbopts.user; var dbuser = dbopts.user;
var dbpass = dbopts.pass; var dbpass = dbopts.pass;
var dbname = dbopts.dbname; var dbname = dbopts.dbname;
var that = this; var that = this;
@ -72,7 +72,7 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
var pg; var pg;
// Drop ending semicolon (ogr doens't like it) // Drop ending semicolon (ogr doens't like it)
sql = sql.replace(/;\s*$/, ''); sql = sql.replace(/;\s*$/, '');
step ( step (
@ -162,7 +162,7 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
} }
if (options.cmd_params){ if (options.cmd_params){
ogrargs.concat(options.cmd_params); ogrargs = ogrargs.concat(options.cmd_params);
} }
ogrargs.push('-nln', out_layername); ogrargs.push('-nln', out_layername);
@ -318,7 +318,7 @@ ExportRequest.prototype.sendFile = function (err, filename, callback) {
}) })
.on('error', function(e) { .on('error', function(e) {
console.log("Can't send response: " + e); console.log("Can't send response: " + e);
that.ostream.end(); that.ostream.end();
callback(); callback();
}); });
} else { } else {

1
app/models/formats/ogr/geopackage.js
View File

@ -16,6 +16,7 @@ GeoPackageFormat.prototype._fileExtension = "gpkg";
GeoPackageFormat.prototype._needSRS = true; GeoPackageFormat.prototype._needSRS = true;
GeoPackageFormat.prototype.generate = function(options, callback) { GeoPackageFormat.prototype.generate = function(options, callback) {
options.cmd_params = ['-lco', 'FID=cartodb_id'];
this.toOGR_SingleFile(options, 'GPKG', callback); this.toOGR_SingleFile(options, 'GPKG', callback);
}; };

2
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "cartodb_sql_api", "name": "cartodb_sql_api",
"version": "1.42.7", "version": "1.42.8",
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.2.13", "version": "1.2.13",

2
package.json
View File

@ -5,7 +5,7 @@
"keywords": [ "keywords": [
"cartodb" "cartodb"
], ],
"version": "1.42.7", "version": "1.42.8",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git" "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"

1
test/acceptance/export/geopackage.js
View File

@ -68,6 +68,7 @@ describe('geopackage query', function(){
assert.equal(err, null); assert.equal(err, null);
assert.equal(row.cartodb_id, 1); assert.equal(row.cartodb_id, 1);
assert.equal(row.name, 'Hawai'); assert.equal(row.name, 'Hawai');
assert.equal(row.fid, undefined);
done(); done();
}); });
assert.notEqual(dqr, undefined); assert.notEqual(dqr, undefined);