Merge pull request #16 from n-r-w/alias_order_by

Select.Alias.OrderBy

Author: n-r-w

README.md

@@ -221,14 +221,16 @@ Select("id", "name").From("users").Paginate(PaginatorByPage(10, 3)).OrderBy("id
 Select().
 Alias("u").Columns("id", "name").
 From("users u")
-Alias("u").GroupBy("id", "name")
-// SELECT u.id, u.name FROM users u GROUP BY u.id, u.name
+Alias("u").GroupBy("id", "name").
+Alias("u").OrderBy("id").
+// SELECT u.id, u.name FROM users u GROUP BY u.id, u.name ORDER BY u.id
 
 Select().
 Alias("u", "pref").Columns("id", "name").
 From("users u")
-Alias("u", "pref").GroupBy("id", "name")
-// SELECT u.id AS pref_id, u.name AS pref_name FROM users u GROUP BY u.id AS pref_id, u.name AS pref_name
+Alias("u", "pref").GroupBy("id", "name").
+Alias("u", "pref").OrderBy("id").
+// SELECT SELECT u.id AS pref_id, u.name AS pref_name FROM users u GROUP BY u.id AS pref_id, u.name AS pref_name ORDER BY u.id AS pref_id
 ```
 
 ## Miscellaneous

select.go

@@ -546,6 +546,15 @@ func (a alias) GroupBy(groupBys ...string) SelectBuilder {
 	return a.builder.GroupBy(prepareAliasColumns(a.table, a.prefix, groupBys...)...)
 }
 
+// OrderBy sets the order by for the table alias.
+func (a alias) OrderBy(orderBys ...string) SelectBuilder {
+	if len(orderBys) == 0 {
+		return a.builder
+	}
+
+	return a.builder.OrderBy(prepareAliasColumns(a.table, a.prefix, orderBys...)...)
+}
+
 func prepareAliasColumns(table string, prefix []string, columns ...string) []string {
 	columnsPrepared := make([]string, 0, len(columns))
 

select_test.go

@@ -504,15 +504,17 @@ func TestTableAlias(t *testing.T) {
 		Alias("u").Columns("id", "name").
 		From("users u").
 		Alias("u").GroupBy("id", "name").
+		Alias("u").OrderBy("id").
 		ToSql()
 	assert.NoError(t, err)
-	assert.Equal(t, "SELECT u.id, u.name FROM users u GROUP BY u.id, u.name", sql)
+	assert.Equal(t, "SELECT u.id, u.name FROM users u GROUP BY u.id, u.name ORDER BY u.id", sql)
 
 	sql, _, err = Select().
 		Alias("u", "pref").Columns("id", "name").
 		From("users u").
 		Alias("u", "pref").GroupBy("id", "name").
+		Alias("u", "pref").OrderBy("id").
 		ToSql()
 	assert.NoError(t, err)
-	assert.Equal(t, "SELECT u.id AS pref_id, u.name AS pref_name FROM users u GROUP BY u.id AS pref_id, u.name AS pref_name", sql)
+	assert.Equal(t, "SELECT u.id AS pref_id, u.name AS pref_name FROM users u GROUP BY u.id AS pref_id, u.name AS pref_name ORDER BY u.id AS pref_id", sql)
 }