Merge pull request brianc#1 from CartoDB/cdb-2.6-row_limit

Fail if pgsql returned row is bigger than limit

Author: Raul Ochoa

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - 0.8
   - "0.10"
 before_script:
   - node script/create-test-tables.js pg://[email protected]:5432/postgres
+env:
+  - PGUSER=postgres PGDATABASE=postgres

Makefile

@@ -23,9 +23,6 @@ test: test-unit
 
 test-all: jshint test-unit test-integration test-native test-binary
 
-test-travis: test-all upgrade-pg
-	@make test-all connectionString=postgres://postgres@localhost:5433/postgres
-
 upgrade-pg:
 	@chmod 755 script/travis-pg-9.2-install.sh
 	@./script/travis-pg-9.2-install.sh

lib/connection.js

@@ -4,6 +4,7 @@ var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
 var utils = require(__dirname + '/utils');
+var defaults = require(__dirname + '/defaults');
 var Writer = require('buffer-writer');
 
 var TEXT_MODE = 0;
@@ -347,6 +348,14 @@ Connection.prototype.parseMessage =  function() {
   //read message length
   var length = this.parseInt32(buffer);
 
+  if (defaults.maxRowSize !== undefined) {
+    if (id == 0x44 && buffer.length > defaults.maxRowSize) {
+      this.stream.emit('error', new Error('Row too large, was ' + buffer.length + ' bytes'));
+      this.stream.emit('end');
+      return false;
+    }
+  }
+
   if(remaining <= length) {
     this.lastBuffer = this.buffer;
     //rewind the last 5 bytes we read

lib/defaults.js

@@ -38,7 +38,9 @@ var defaults = module.exports = {
 
   client_encoding: "",
 
-  ssl: false
+  ssl: false,
+
+  maxRowSize: undefined
 };
 
 //parse int8 so you can get your count values as actual numbers

package.json

@@ -26,7 +26,7 @@
     "semver": "~1.1.4"
   },
   "scripts": {
-    "test": "make test-travis connectionString=postgres://postgres@localhost:5432/postgres",
+    "test": "make test-all connectionString=postgres://postgres@localhost:5432/postgres",
     "install": "node-gyp rebuild || (exit 0)"
   },
   "engines": {

test/integration/client/error-handling-tests.js

@@ -1,4 +1,5 @@
 var helper = require(__dirname + '/test-helper');
+var pg = helper.pg;
 var util = require('util');
 
 var createErorrClient = function() {
@@ -179,3 +180,27 @@ test('query receives error on client shutdown', function() {
   }));
 });
 
+test('query adeheres to maxRowSize', function() {
+    // not implemented in native library, so it does not make sense to run this test in native mode
+    if (helper.config.native) {
+        return true;
+    }
+
+    var client = new Client(helper.config);
+
+    client.connect(function() {
+        var query = 'SELECT 1 as id',
+            queryRowSize = 60;
+
+        test('too large row', function() {
+            pg.defaults.maxRowSize = queryRowSize - 1;
+            client.query(query, assert.calls(function(err, res) {
+                // relax maxRowSize
+                pg.defaults.maxRowSize = undefined;
+
+                assert(err);
+                assert.equal(err.message, 'Row too large, was ' + queryRowSize + ' bytes');
+            }));
+        });
+    });
+});