Merge branch 'master' of git://github.com/yiisoft/yii2

This commit is contained in:
Qiang Xue
2014-01-29 16:38:45 -05:00

View File

@@ -251,7 +251,7 @@ $query = new Query;
$query->select("id, 'post' as type, name")->from('tbl_post')->limit(10); $query->select("id, 'post' as type, name")->from('tbl_post')->limit(10);
$anotherQuery = new Query; $anotherQuery = new Query;
$query->select('id, 'user' as type, name')->from('tbl_user')->limit(10); $anotherQuery->select('id, 'user' as type, name')->from('tbl_user')->limit(10);
$query->union($anotherQuery); $query->union($anotherQuery);
``` ```