From 1ed0c735255be03d5be8017d0cb7204024f671ac Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 18 Apr 2016 14:30:20 +0200
Subject: [PATCH] Upgrades cartodb-psql to 0.6.1 version.

---
 NEWS.md             |  1 +
 npm-shrinkwrap.json | 42 +++++++++---------------------------------
 package.json        |  2 +-
 3 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 6bb6d872..bcb7f914 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@
 Released 2016-mm-dd
 
 Announcements:
+ - Upgrades cartodb-psql to 0.6.1 version.
  - Upgrades windshaft to [1.17.1](https://github.com/CartoDB/Windshaft/releases/tag/1.17.1)
 
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 24d19d96..4c0100dd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -34,7 +34,7 @@
             },
             "statuses": {
               "version": "1.2.1",
-              "from": "statuses@>=1.0.0 <2.0.0",
+              "from": "statuses@>=1.2.1 <1.3.0",
               "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
             }
           }
@@ -80,7 +80,7 @@
         },
         "type-is": {
           "version": "1.6.12",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
           "dependencies": {
             "media-typer": {
@@ -105,14 +105,14 @@
       }
     },
     "cartodb-psql": {
-      "version": "0.4.0",
-      "from": "cartodb-psql@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.4.0.tgz",
+      "version": "0.6.1",
+      "from": "cartodb-psql@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.6.1.tgz",
       "dependencies": {
         "pg": {
-          "version": "2.6.2-cdb1",
-          "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1",
-          "resolved": "git://github.com/CartoDB/node-postgres.git#836a2dc3131e873fc4ba20cd16e7fb69a7dca98a",
+          "version": "2.6.2-cdb3",
+          "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb3",
+          "resolved": "git://github.com/CartoDB/node-postgres.git#069c5296d1a093077feff21719641bb9e71fc50e",
           "dependencies": {
             "generic-pool": {
               "version": "2.0.3",
@@ -453,7 +453,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "inherits@>=2.0.1 <2.1.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -1406,30 +1406,6 @@
             }
           }
         },
-        "cartodb-psql": {
-          "version": "0.6.1",
-          "from": "cartodb-psql@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.6.1.tgz",
-          "dependencies": {
-            "pg": {
-              "version": "2.6.2-cdb3",
-              "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb3",
-              "resolved": "git://github.com/CartoDB/node-postgres.git#069c5296d1a093077feff21719641bb9e71fc50e",
-              "dependencies": {
-                "generic-pool": {
-                  "version": "2.0.3",
-                  "from": "generic-pool@2.0.3",
-                  "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.0.3.tgz"
-                },
-                "buffer-writer": {
-                  "version": "1.0.0",
-                  "from": "buffer-writer@1.0.0",
-                  "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.0.tgz"
-                }
-              }
-            }
-          }
-        },
         "es6-promise": {
           "version": "3.1.2",
           "from": "es6-promise@>=3.1.2 <4.0.0",
diff --git a/package.json b/package.json
index 3eadb40a..9ef9d4f3 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
         "queue-async": "~1.0.7",
         "request": "~2.62.0",
         "cartodb-redis": "~0.13.0",
-        "cartodb-psql": "~0.4.0",
+        "cartodb-psql": "~0.6.1",
         "fastly-purge": "~1.0.1",
         "redis-mpool": "~0.4.0",
         "lru-cache": "2.6.5",