stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

optimized joins

Browse source
This commit is contained in:
Steffen Vogel 2010-06-14 07:41:41 +02:00
parent 59d1b4d8af
commit 95ad53ec5f
3 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
backend/lib/model/channel.php
View file

@ -193,10 +193,11 @@ abstract class Channel extends DatabaseObject implements ChannelInterface {
$sql = 'SELECT ' . self::table . '.* FROM ' . self::table;
// join groups
if (key_exists('group', $filters)) {
if (preg_match('/^group\.([a-z_]+)$/', $filters)) {
$sql .= ' LEFT JOIN channels_in_groups ON channels_in_groups.channel_id = ' . self::table . '.id';
$filters['channels_in_groups.group_id'] = $filters['group'];
unset($filters['group']);
$sql .= ' LEFT JOIN groups ON groups.id = channels_in_groups.group_id';
$filters = preg_replace('/^group\.([a-z_]+)$/', 'groups.$1', $filters);
}
$sql .= self::buildFilterCondition($filters, $conjunction);

18
backend/lib/model/group.php
View file

@ -32,7 +32,7 @@ class Group extends NestedDatabaseObject {
if ($recursive === true) {
$groups += $this->getChilds();
}
return User::getByFilter(array('group' => $groups));
return User::getByFilter(array('group.id' => $groups));
}
public function getChannels($recursive = false) { // TODO rework for nested sets
@ -40,24 +40,26 @@ class Group extends NestedDatabaseObject {
if ($recursive === true) {
$groups += $this->getChilds();
}
return Channel::getByFilter(array('group' => $groups));
return Channel::getByFilter(array('group.id' => $groups));
}
static protected function buildFilterQuery($filters, $conjunction, $columns = array('id')) { // TODO rework for nested sets
$sql = 'SELECT ' . self::table . '.* FROM ' . self::table;
// join users
if (key_exists('user', $filters)) {
if (preg_match('/^user\.([a-z_]+)$/', $filters)) {
$sql .= ' LEFT JOIN users_in_groups ON users_in_groups.group_id = ' . self::table . '.id';
$filters['users_in_groups.user_id'] = $filters['user'];
unset($filters['user']);
$sql .= ' LEFT JOIN users ON users.id = users_in_groups.user_id';
$filters = preg_replace('/^user\.([a-z_]+)$/', 'users.$1', $filters);
}
// join channels
if (key_exists('channel', $filters)) {
if (preg_match('/^channel\.([a-z_]+)$/', $filters)) {
$sql .= ' LEFT JOIN channels_in_groups ON channels_in_groups.group_id = ' . self::table . '.id';
$filters['channels_in_groups.channel_id'] = $filters['channel'];
unset($filters['channel']);
$sql .= ' LEFT JOIN channels ON channels.id = channels_in_groups.channel_id';
$filters = preg_replace('/^channel\.([a-z_]+)$/', 'channels.$1', $filters);
}
$sql .= static::buildFilterCondition($filters, $conjunction);

15
backend/lib/model/user.php
View file

@ -38,11 +38,11 @@ class User extends DatabaseObject {
public function getChannels($recursive = false) {
$groups = $this->getGroups($recursive);
return Channel::getByFilter(array('group' => $groups));
return Channel::getByFilter(array('group.id' => $groups));
}
public function getGroups($recursive = false) {
$groups = Group::getByFilter(array('user' => $this));
$groups = Group::getByFilter(array('user.id' => $this));
if ($recursive === true) {
foreach ($groups as $subGroup) {
$groups += $subGroup->getGroups(true);
@ -62,14 +62,17 @@ class User extends DatabaseObject {
parent::__set($key, $value);
}
static protected function buildQuery($filters, $conjunction, $columns = array('id')) {
static protected function buildQuery($filters, $conjunction) {
$sql = 'SELECT ' . self::table . '.* FROM ' . self::table;
// join groups
if (key_exists('group', $filters)) {
if (preg_match('/^group\.([a-z_]+)$/', $filters)) {
$sql .= ' LEFT JOIN users_in_groups ON users_in_groups.user_id = ' . self::table . '.id';
$filters['users_in_groups.group_id'] = $filters['group'];
unset($filters['group']);
$sql .= ' LEFT JOIN groups ON groups.id = users_in_groups.group_id';
$filters = preg_replace('/^group\.([a-z_]+)$/', 'groups.$1', $filters);
}
$sql .= static::buildFilter($filters, $conjunction);
return $sql;
}