From b469d5eabf32e64b3eb6feedc638b73d9658d896 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 5 Sep 2012 15:49:10 +0200
Subject: [PATCH] Rename authenticated postgresql user configuration setting

See issue #49
---
 config/environments/development.js | 2 +-
 config/environments/production.js  | 2 +-
 config/environments/staging.js     | 2 +-
 config/environments/test.js        | 2 +-
 lib/cartodb/carto_data.js          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/environments/development.js b/config/environments/development.js
index 0f5b0cd5..e141bfda 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -4,10 +4,10 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: false
+    ,postgres_auth_user: 'development_cartodb_user_<%= user_id %>'
     ,postgres: {
         type: "postgis",
         user: "publicuser",
-        db_user: 'development_cartodb_user_<%= user_id %>',
         host: '127.0.0.1',
         port: 5432,
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
diff --git a/config/environments/production.js b/config/environments/production.js
index b35da0c2..28365971 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -4,9 +4,9 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: true
+    ,postgres_auth_user: 'cartodb_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
-        db_user: 'cartodb_user_<%= user_id %>',
         host: '127.0.0.1',
         port: 6432,
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
diff --git a/config/environments/staging.js b/config/environments/staging.js
index 83339ce3..87c0e1c6 100644
--- a/config/environments/staging.js
+++ b/config/environments/staging.js
@@ -4,9 +4,9 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: true
+    ,postgres_auth_user: 'cartodb_staging_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
-        db_user: 'cartodb_staging_user_<%= user_id %>',
         host: '127.0.0.1',
         port: 6432,
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
diff --git a/config/environments/test.js b/config/environments/test.js
index a1d6b751..d7ee5739 100644
--- a/config/environments/test.js
+++ b/config/environments/test.js
@@ -4,9 +4,9 @@ var config = {
     ,host: '127.0.0.1'
     ,enable_cors: true
     ,cache_enabled: false
+    ,postgres_auth_user: 'test_cartodb_user_<%= user_id %>'
     ,postgres: {
         user: "publicuser",
-        db_user: 'test_cartodb_user_<%= user_id %>',
         host: '127.0.0.1',
         port: 5432,
         srid: 4326,
diff --git a/lib/cartodb/carto_data.js b/lib/cartodb/carto_data.js
index 355c489a..27d27168 100644
--- a/lib/cartodb/carto_data.js
+++ b/lib/cartodb/carto_data.js
@@ -89,7 +89,7 @@ module.exports = function() {
                     // authorized by key, login as db owner 
                     that.getId(req, function(err, user_id) {
                         if (err) throw new Error(err);
-                        var dbuser = _.template(global.settings.postgres.db_user, {user_id: user_id});
+                        var dbuser = _.template(global.settings.postgres_auth_user, {user_id: user_id});
                         _.extend(req, {dbuser:dbuser});
                         callback(err, true); 
                     });