diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
index a55f343d..9d9f547a 100644
--- a/lib/dialect/postgres.js
+++ b/lib/dialect/postgres.js
@@ -1041,13 +1041,13 @@ Postgres.prototype.visitOnDuplicate = function(onDuplicate) {
 Postgres.prototype.visitOnConflict = function(onConflict) {
   var result = ['ON CONFLICT'];
   var columns = [];
-  var updateClause = [], i;
-
+  var updateClause = [], i, col;
+  var table = this._queryNode.table;
   if(onConflict.constraint)
     result.push(['ON CONSTRAINT', this.quote(onConflict.constraint)].join(' '));
   else if(onConflict.columns) {
     for(i=0; i < onConflict.columns.length; i++) {
-      columns.push(this.quote(onConflict.columns[i]));
+      columns.push(this.quote(table.getColumn(onConflict.columns[i]).name));
     }
     result.push( '(' + columns.join(', ') + ')' );
   }
@@ -1057,7 +1057,8 @@ Postgres.prototype.visitOnConflict = function(onConflict) {
     var update = onConflict.update;
     var setClause = [];
     for(i=0; i<update.length; i++) {
-      setClause.push(this.quote(update[i]) + ' = EXCLUDED.' +this.quote(update[i]));
+      col = this.quote(table.getColumn(update[i]).name);
+      setClause.push(col + ' = EXCLUDED.' + col);
     }
     updateClause.push(setClause.join(', '));
   }
diff --git a/test/dialects/insert-tests.js b/test/dialects/insert-tests.js
index 86a710cc..30f83712 100644
--- a/test/dialects/insert-tests.js
+++ b/test/dialects/insert-tests.js
@@ -3,6 +3,8 @@
 var Harness = require('./support');
 var post = Harness.definePostTable();
 var user = Harness.defineUserTable();
+var contentTable = Harness.defineContentTable();
+var customerAliasTable = Harness.defineCustomerAliasTable();
 
 var arrayTable = require('../../lib/table').define({
     name: 'arraytest',
@@ -626,6 +628,33 @@ Harness.test({
   params: ['test', 2, 'testupdate']
 });
 
+Harness.test({
+  query: customerAliasTable.insert({
+    id : 2,
+    name : 'test'
+  }).onConflict({
+    columns: ['id'],
+    update: ['name']
+  }),
+  mysql: {
+    throws: true
+  },
+  sqlite: {
+    throws: true
+  },
+  pg: {
+    text  : 'INSERT INTO "customer" ("id", "name") VALUES ($1, $2) ON CONFLICT ("id") DO UPDATE SET "name" = EXCLUDED."name"',
+    string: 'INSERT INTO "customer" ("id", "name") VALUES (2, \'test\') ON CONFLICT ("id") DO UPDATE SET "name" = EXCLUDED."name"'
+  },
+  mssql: {
+    throws: true
+  },
+  oracle: {
+    throws: true
+  },
+  params: [2, 'test']
+});
+
 Harness.test({
   query: post.insert({
     content: 'test',
@@ -786,6 +815,60 @@ Harness.test({
   params: ['test', 2]
 });
 
+Harness.test({
+  query: contentTable.insert({
+    contentId: 20,
+    text : "something" 
+  }).onConflict({
+    columns: ['contentId'],
+  }),
+  mysql: {
+    throws: true
+  },
+  sqlite: {
+    throws: true
+  },
+  pg: {
+    text  : 'INSERT INTO "content" ("content_id", "text") VALUES ($1, $2) ON CONFLICT ("content_id") DO NOTHING',
+    string: 'INSERT INTO "content" ("content_id", "text") VALUES (20, \'something\') ON CONFLICT ("content_id") DO NOTHING'
+  },
+  mssql: {
+    throws: true
+  },
+  oracle: {
+    throws: true
+  },
+  params: [20, "something"]
+});
+
+Harness.test({
+  query: contentTable.insert({
+    contentId: 20,
+    text : "something",
+    contentPosts : "another thing",
+  }).onConflict({
+    columns: ['contentId'],
+    update: ['contentPosts']
+  }),
+  mysql: {
+    throws: true
+  },
+  sqlite: {
+    throws: true
+  },
+  pg: {
+    text  : 'INSERT INTO "content" ("content_id", "text", "content_posts") VALUES ($1, $2, $3) ON CONFLICT ("content_id") DO UPDATE SET "content_posts" = EXCLUDED."content_posts"',
+    string: 'INSERT INTO "content" ("content_id", "text", "content_posts") VALUES (20, \'something\', \'another thing\') ON CONFLICT ("content_id") DO UPDATE SET "content_posts" = EXCLUDED."content_posts"'
+  },
+  mssql: {
+    throws: true
+  },
+  oracle: {
+    throws: true
+  },
+  params: [20, "something", "another thing"]
+});
+
 Harness.test({
   query: post.insert([]),
 
diff --git a/test/dialects/support.js b/test/dialects/support.js
index f1d926e9..83da378f 100644
--- a/test/dialects/support.js
+++ b/test/dialects/support.js
@@ -124,5 +124,14 @@ module.exports = {
       name: 'variable',
       columns: ['a', 'b', 'c', 'd', 't', 'u', 'v', 'x', 'y', 'z']
     });
+  },
+
+// this table is for testing snakeName related stuff
+  defineContentTable: function() {
+    return Table.define({
+      name: 'content',
+      columns: ['content_id', 'text', 'content_posts'],
+      snakeToCamel: true
+    });
   }
 };