Merge branch 'master' into node-v6

NEWS.md

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

app/models/formats/ogr.js

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

app/models/formats/ogr/geopackage.js

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

npm-shrinkwrap.json

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

package.json

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

test/acceptance/export/geopackage.js

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