Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversion to actors #1

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Conversion to actors #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions classes/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,9 +1046,10 @@ private function _notcategory($option) {
private function _createdby($option) {
$this->addTable('revision', 'creation_rev');
$this->_adduser(null, 'creation_rev');
$user = new \User;
$this->addWhere(
[
$this->DB->addQuotes($option) . ' = creation_rev.rev_actor',
$this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' = creation_rev.rev_actor',
'creation_rev.rev_page = page_id',
'creation_rev.rev_parent_id = 0'
]
Expand Down Expand Up @@ -1199,7 +1200,8 @@ private function _imageused($option) {
* @return void
*/
private function _lastmodifiedby($option) {
$this->addWhere($this->DB->addQuotes($option) . ' = (SELECT rev_actor FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id ORDER BY ' . $this->tableNames['revision'] . '.rev_timestamp DESC LIMIT 1)');
$user = new \User;
$this->addWhere($this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' = (SELECT rev_actor FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id ORDER BY ' . $this->tableNames['revision'] . '.rev_timestamp DESC LIMIT 1)');
}

/**
Expand Down Expand Up @@ -1479,7 +1481,8 @@ private function _minrevisions($option) {
*/
private function _modifiedby($option) {
$this->addTable('revision', 'change_rev');
$this->addWhere($this->DB->addQuotes($option) . ' = change_rev.rev_actor AND change_rev.rev_page = page_id');
$user = new \User;
$this->addWhere($this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' = change_rev.rev_actor AND change_rev.rev_page = page_id');
}

/**
Expand Down Expand Up @@ -1516,7 +1519,8 @@ private function _namespace($option) {
*/
private function _notcreatedby($option) {
$this->addTable('revision', 'no_creation_rev');
$this->addWhere($this->DB->addQuotes($option) . ' != no_creation_rev.rev_actor AND no_creation_rev.rev_page = page_id AND no_creation_rev.rev_parent_id = 0');
$user = new \User;
$this->addWhere($this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' != no_creation_rev.rev_actor AND no_creation_rev.rev_page = page_id AND no_creation_rev.rev_parent_id = 0');
}

/**
Expand All @@ -1527,7 +1531,8 @@ private function _notcreatedby($option) {
* @return void
*/
private function _notlastmodifiedby($option) {
$this->addWhere($this->DB->addQuotes($option) . ' != (SELECT rev_actor FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id ORDER BY ' . $this->tableNames['revision'] . '.rev_timestamp DESC LIMIT 1)');
$user = new \User;
$this->addWhere($this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' != (SELECT rev_actor FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id ORDER BY ' . $this->tableNames['revision'] . '.rev_timestamp DESC LIMIT 1)');
}

/**
Expand All @@ -1538,7 +1543,8 @@ private function _notlastmodifiedby($option) {
* @return void
*/
private function _notmodifiedby($option) {
$this->addWhere('NOT EXISTS (SELECT 1 FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id AND ' . $this->tableNames['revision'] . '.rev_actor = ' . $this->DB->addQuotes($option) . ' LIMIT 1)');
$user = new \User;
$this->addWhere('NOT EXISTS (SELECT 1 FROM ' . $this->tableNames['revision'] . ' WHERE ' . $this->tableNames['revision'] . '.rev_page=page_id AND ' . $this->tableNames['revision'] . '.rev_actor = ' . $this->DB->addQuotes( $user->newFromName( $option )->getActorId() ) . ' LIMIT 1)');
}

/**
Expand Down Expand Up @@ -1834,7 +1840,8 @@ private function _ordermethod($option) {
}
break;
case 'user':
$this->addOrderBy('rev.rev_actor');
$user = new \User;
$this->addOrderBy( $user->newFromName( 'rev.rev_actor' )->getActorId() );
$this->addTable('revision', 'rev');
$this->_adduser(null, 'rev');
break;
Expand Down