From d667d64c78f43cc51fd51cf6695d78ef4beb90f1 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 13 Feb 2013 13:02:37 +0100
Subject: [PATCH] Fix skipfields use with SHP output format. Closes #81

---
 NEWS.md                             |  1 +
 app/controllers/app.js              |  2 +-
 test/acceptance/export/shapefile.js | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 7ee5eb77..8b212f0d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,6 @@
 1.3.5 (DD/MM/YY)
 -----
+* Fix skipfields use with SHP output format (#81)
 
 1.3.4 (21/01/13)
 -----
diff --git a/app/controllers/app.js b/app/controllers/app.js
index 821f17a8..d307d95e 100755
--- a/app/controllers/app.js
+++ b/app/controllers/app.js
@@ -250,7 +250,7 @@ function handleQuery(req, res) {
             function packageResults(err, result){
                 if (err) throw err;
 
-                if ( skipfields.length ){
+                if ( result && skipfields.length ){
                   for ( var i=0; i<result.rows.length; ++i ) {
                     for ( var j=0; j<skipfields.length; ++j ) {
                       delete result.rows[i][skipfields[j]];
diff --git a/test/acceptance/export/shapefile.js b/test/acceptance/export/shapefile.js
index 73167f35..c1b0e63c 100644
--- a/test/acceptance/export/shapefile.js
+++ b/test/acceptance/export/shapefile.js
@@ -194,6 +194,7 @@ test('mixed type geometry', function(done){
         encoding: 'binary',
         method: 'GET'
     },{ }, function(res){
+        assert.deepEqual(res.headers['content-type'], 'application/json; charset=utf-8');
         assert.equal(res.statusCode, 400, res.statusCode + ': ' +res.body);
         var parsedBody = JSON.parse(res.body);
         var expectedBody = {"error":["ERROR 1: Attempt to write non-point (LINESTRING) geometry to point shapefile."]}
@@ -202,5 +203,31 @@ test('mixed type geometry', function(done){
     });
 });
 
+test('skipfields controls fields included in SHP output', function(done){
+    var query = querystring.stringify({
+        q: "SELECT 111 as skipme, 222 as keepme, 'POINT(0 0)'::geometry as g",
+        format: 'shp',
+        skipfields: 'skipme',
+        filename: 'myshape'
+      });
+    assert.response(app, {
+        url: '/api/v1/sql?' + query,
+        headers: {host: 'vizzuality.cartodb.com'},
+        encoding: 'binary',
+        method: 'GET'
+    },{ }, function(res){
+        assert.equal(res.statusCode, 200, res.body);
+        var tmpfile = '/tmp/myshape.zip';
+        var err = fs.writeFileSync(tmpfile, res.body, 'binary');
+        if (err) { done(err); return }
+        var zf = new zipfile.ZipFile(tmpfile);
+        var buffer = zf.readFileSync('myshape.dbf');
+        fs.unlinkSync(tmpfile);
+        var strings = buffer.toString();
+        assert.ok(!/skipme/.exec(strings), "Could not skip 'skipme' field:\n" + strings);
+        done();
+    });
+});
+
 
 });