Merge pull request #49 from 2do2go/feature/add-subquery-alias

Add alias to subquery

Author: Serpan911

lib/dialects/base/blocks.js

@@ -368,11 +368,25 @@ module.exports = function(dialect) {
 	});
 
 	dialect.blocks.add('query', function(params) {
-		return dialect.buildTemplate('subQuery', {queryBody: params.query});
+		var templateParams = {
+			queryBody: params.query
+		};
+		if (params.query && params.query.type === 'union') {
+			templateParams.alias = params.query.alias;
+		}
+
+		return dialect.buildTemplate('subQuery', templateParams);
 	});
 
 	dialect.blocks.add('select', function(params) {
-		return dialect.buildTemplate('subQuery', {queryBody: params.select});
+		var templateParams = {
+			queryBody: params.select
+		};
+		if (params.select && params.select.type === 'union') {
+			templateParams.alias = params.select.alias;
+		}
+
+		return dialect.buildTemplate('subQuery', templateParams);
 	});
 
 	dialect.blocks.add('queries', function(params) {

lib/dialects/base/templates.js

@@ -19,10 +19,12 @@ module.exports = function(dialect) {
 
 
 	dialect.templates.add('subQuery', {
-		pattern: '({queryBody})',
+		pattern: '({queryBody}) {alias}',
 		validate: function(type, params) {
 			templateChecks.requiredProp(type, params, 'queryBody');
 			templateChecks.propType(type, params, 'queryBody', 'object');
+
+			templateChecks.propType(type, params, 'alias', ['string', 'object']);
 		}
 	});