Merge pull request #2720 from jpmonette/master

Fixing "error: syntax error at or near ")"" when using upsert with postgres dialect

lib/dialects/postgres/query-generator.js

@@ -355,7 +355,7 @@ module.exports = (function() {
 
     // http://www.maori.geek.nz/post/postgres_upsert_update_or_insert_in_ger_using_knex_js
     upsertQuery: function (tableName, insertValues, updateValues, where, rawAttributes, options) {
-      var insert = this.insertQuery(tableName, insertValues, rawAttributes, options).replace(/VALUES \((.*?)\)/, 'SELECT $1');
+      var insert = this.insertQuery(tableName, insertValues, rawAttributes, options);
       var update = this.updateQuery(tableName, updateValues, where, options, rawAttributes);
 
       // The numbers here are selected to match the number of affected rows returned by MySQL