Merge pull request #282 from iamcharliegoddard/fix-alias-as-column-name

Tables with "alias" as a column name error on word.replace

Author: brianc

lib/dialect/postgres.js

@@ -689,7 +689,7 @@ Postgres.prototype.visitTable = function(tableNode) {
     txt += '.';
   }
   txt += this.quote(table.getName());
-  if(table.alias) {
+  if(typeof table.alias === 'string') {
     txt += this._aliasText + this.quote(table.alias);
   }
   return [txt];
@@ -729,7 +729,7 @@ Postgres.prototype.visitColumn = function(columnNode) {
     }
   }
   if(!inInsertUpdateClause && !this.visitingReturning && !this._visitingCreate && !this._visitingAlter && !columnNode.subfieldContainer) {
-    if(table.alias) {
+    if(typeof table.alias === 'string') {
       txt.push(this.quote(table.alias));
     } else {
       if(table.getSchema()) {

test/column-tests.js

@@ -6,7 +6,7 @@ var sql = require(__dirname + '/../lib');
 describe('column', function() {
   var table = sql.define({
     name: 'user',
-    columns: ['id', 'created']
+    columns: ['id', 'created', 'alias']
   });
 
   it('can be accessed by property and array', function() {
@@ -18,6 +18,10 @@ describe('column', function() {
       assert.equal(table.id.toQuery().text, '"user"."id"');
     });
 
+    it('works with a column name of "alias"', function() {
+      assert.equal(table.alias.toQuery().text, '"user"."alias"');
+    });
+
     it('respects AS rename', function() {
       assert.equal(table.id.as('userId').toQuery().text, '"user"."id" AS "userId"');
     });