fixed missing table name for .star() with alias case

Bergwinkl Thomas · Bergwinkl Thomas · commit 728fe06afd72 · 2015-01-14T10:13:28.000+01:00
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -650,14 +650,20 @@ Postgres.prototype.visitColumn = function(columnNode) {
     var allCols = [];
     var hasAliases = false;
     if(columnNode.aggregator !== 'COUNT') {
+      var tableName = txt.join('');
       for (var i = 0; i < table.columns.length; ++i) {
         var col = table.columns[i];
         var aliased = col.name !== (col.alias || col.property);
         hasAliases = hasAliases || aliased;
-        allCols.push(this.quote(col.name) + (aliased ? ' AS ' + this.quote(col.alias || col.property) : ''));
+        allCols.push(tableName + this.quote(col.name) + (aliased ? ' AS ' + this.quote(col.alias || col.property) : ''));
       }
     }
-    txt.push(hasAliases ? allCols.join(', ') : '*');
+    if(hasAliases) {
+      txt = [allCols.join(', ')];
+    }
+    else {
+      txt.push('*');
+    }
   }
   else {
     txt.push(this.quote(columnNode.name));
diff --git a/test/dialects/select-tests.js b/test/dialects/select-tests.js
@@ -2,6 +2,7 @@
 
 var Harness = require('./support');
 var post = Harness.definePostTable();
+var customerAlias = Harness.defineCustomerAliasTable();
 
 Harness.test({
   query: post.select(post.id).select(post.content),
@@ -19,3 +20,20 @@ Harness.test({
   },
   params: []
 });
+
+Harness.test({
+  query: customerAlias.select(customerAlias.star()),
+  pg: {
+    text  : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"',
+    string: 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"'
+  },
+  sqlite: {
+    text  : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"',
+    string: 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"'
+  },
+  mysql: {
+    text :  'SELECT `customer`.`id` AS `id_alias`, `customer`.`name` AS `name_alias`, `customer`.`age` AS `age_alias`, `customer`.`income` AS `income_alias`, `customer`.`metadata` AS `metadata_alias` FROM `customer`',
+    string: 'SELECT `customer`.`id` AS `id_alias`, `customer`.`name` AS `name_alias`, `customer`.`age` AS `age_alias`, `customer`.`income` AS `income_alias`, `customer`.`metadata` AS `metadata_alias` FROM `customer`'
+  },
+  params: []
+});
