Page MenuHomePhabricator
Files F15407254

D13196.id.diff
No OneTemporary
Actions

D13196.id.diff
View Options

diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -150,22 +150,13 @@
$this->identifierMap = array();
}
- protected function loadPage() {
- $table = new PhabricatorRepository();
- $conn_r = $table->establishConnection('r');
-
- $data = queryfx_all(
- $conn_r,
- '%Q FROM %T r %Q %Q %Q %Q %Q %Q',
- $this->buildSelectClause($conn_r),
- $table->getTableName(),
- $this->buildJoinClause($conn_r),
- $this->buildWhereClause($conn_r),
- $this->buildGroupClause($conn_r),
- $this->buildHavingClause($conn_r),
- $this->buildOrderClause($conn_r),
- $this->buildLimitClause($conn_r));
+ public function newResultObject() {
+ return new PhabricatorRepository();
+ }
+ protected function loadPage() {
+ $table = $this->newResultObject();
+ $data = $this->loadStandardPageRows($table);
$repositories = $table->loadAllFromArray($data);
if ($this->needCommitCounts) {
@@ -386,25 +377,27 @@
return $map;
}
- protected function buildSelectClause(AphrontDatabaseConnection $conn) {
- $parts = $this->buildSelectClauseParts($conn);
+ protected function buildSelectClauseParts(AphrontDatabaseConnection $conn) {
+ $parts = parent::buildSelectClauseParts($conn);
+
if ($this->shouldJoinSummaryTable()) {
$parts[] = 's.*';
}
- return $this->formatSelectClause($parts);
+
+ return $parts;
}
- protected function buildJoinClause(AphrontDatabaseConnection $conn_r) {
- $joins = $this->buildJoinClauseParts($conn_r);
+ protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+ $joins = parent::buildJoinClauseParts($conn);
if ($this->shouldJoinSummaryTable()) {
$joins[] = qsprintf(
- $conn_r,
+ $conn,
'LEFT JOIN %T s ON r.id = s.repositoryID',
PhabricatorRepository::TABLE_SUMMARY);
}
- return $this->formatJoinClause($joins);
+ return $joins;
}
private function shouldJoinSummaryTable() {
@@ -428,26 +421,26 @@
return false;
}
- protected function buildWhereClauseParts(AphrontDatabaseConnection $conn_r) {
- $where = parent::buildWhereClauseParts($conn_r);
+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+ $where = parent::buildWhereClauseParts($conn);
- if ($this->ids) {
+ if ($this->ids !== null) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.id IN (%Ld)',
$this->ids);
}
- if ($this->phids) {
+ if ($this->phids !== null) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.phid IN (%Ls)',
$this->phids);
}
- if ($this->callsigns) {
+ if ($this->callsigns !== null) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.callsign IN (%Ls)',
$this->callsigns);
}
@@ -459,21 +452,21 @@
if ($this->numericIdentifiers) {
$identifier_clause[] = qsprintf(
- $conn_r,
+ $conn,
'r.id IN (%Ld)',
$this->numericIdentifiers);
}
if ($this->callsignIdentifiers) {
$identifier_clause[] = qsprintf(
- $conn_r,
+ $conn,
'r.callsign IN (%Ls)',
$this->callsignIdentifiers);
}
if ($this->phidIdentifiers) {
$identifier_clause[] = qsprintf(
- $conn_r,
+ $conn,
'r.phid IN (%Ls)',
$this->phidIdentifiers);
}
@@ -483,21 +476,21 @@
if ($this->types) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.versionControlSystem IN (%Ls)',
$this->types);
}
if ($this->uuids) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.uuid IN (%Ls)',
$this->uuids);
}
if (strlen($this->nameContains)) {
$where[] = qsprintf(
- $conn_r,
+ $conn,
'name LIKE %~',
$this->nameContains);
}
@@ -511,7 +504,7 @@
$callsign = $query;
}
$where[] = qsprintf(
- $conn_r,
+ $conn,
'r.name LIKE %> OR r.callsign LIKE %>',
$query,
$callsign);
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -11,122 +11,66 @@
return 'PhabricatorDiffusionApplication';
}
- public function buildSavedQueryFromRequest(AphrontRequest $request) {
- $saved = new PhabricatorSavedQuery();
-
- $saved->setParameter('callsigns', $request->getStrList('callsigns'));
- $saved->setParameter('status', $request->getStr('status'));
- $saved->setParameter('order', $request->getStr('order'));
- $saved->setParameter('hosted', $request->getStr('hosted'));
- $saved->setParameter('types', $request->getArr('types'));
- $saved->setParameter('name', $request->getStr('name'));
-
- $saved->setParameter(
- 'projects',
- $this->readProjectsFromRequest($request, 'projects'));
-
- return $saved;
- }
-
- public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
- $query = id(new PhabricatorRepositoryQuery())
+ public function newQuery() {
+ return id(new PhabricatorRepositoryQuery())
->needProjectPHIDs(true)
->needCommitCounts(true)
->needMostRecentCommits(true);
+ }
- $callsigns = $saved->getParameter('callsigns');
- if ($callsigns) {
- $query->withCallsigns($callsigns);
- }
-
- $status = $saved->getParameter('status');
- $status = idx($this->getStatusValues(), $status);
- if ($status) {
- $query->withStatus($status);
- }
+ protected function buildCustomSearchFields() {
+ return array(
+ id(new PhabricatorSearchStringListField())
+ ->setLabel(pht('Callsigns'))
+ ->setKey('callsigns'),
+ id(new PhabricatorSearchTextField())
+ ->setLabel(pht('Name Contains'))
+ ->setKey('name'),
+ id(new PhabricatorSearchSelectField())
+ ->setLabel(pht('Status'))
+ ->setKey('status')
+ ->setOptions($this->getStatusOptions()),
+ id(new PhabricatorSearchSelectField())
+ ->setLabel(pht('Hosted'))
+ ->setKey('hosted')
+ ->setOptions($this->getHostedOptions()),
+ id(new PhabricatorSearchCheckboxesField())
+ ->setLabel(pht('Types'))
+ ->setKey('types')
+ ->setOptions(PhabricatorRepositoryType::getAllRepositoryTypes()),
+ );
+ }
- $this->setQueryOrder($query, $saved);
+ public function buildQueryFromParameters(array $map) {
+ $query = $this->newQuery();
- $hosted = $saved->getParameter('hosted');
- $hosted = idx($this->getHostedValues(), $hosted);
- if ($hosted) {
- $query->withHosted($hosted);
+ if ($map['callsigns']) {
+ $query->withCallsigns($map['callsigns']);
}
- $types = $saved->getParameter('types');
- if ($types) {
- $query->withTypes($types);
+ if ($map['status']) {
+ $status = idx($this->getStatusValues(), $map['status']);
+ if ($status) {
+ $query->withStatus($status);
+ }
}
- $name = $saved->getParameter('name');
- if (strlen($name)) {
- $query->withNameContains($name);
+ if ($map['hosted']) {
+ $hosted = idx($this->getHostedValues(), $map['hosted']);
+ if ($hosted) {
+ $query->withHosted($hosted);
+ }
}
- $adjusted = clone $saved;
- $adjusted->setParameter('projects', $this->readProjectTokens($saved));
- $this->setQueryProjects($query, $adjusted);
-
- return $query;
- }
+ if ($map['types']) {
+ $query->withTypes($map['types']);
+ }
- public function buildSearchForm(
- AphrontFormView $form,
- PhabricatorSavedQuery $saved_query) {
-
- $callsigns = $saved_query->getParameter('callsigns', array());
- $types = $saved_query->getParameter('types', array());
- $types = array_fuse($types);
- $name = $saved_query->getParameter('name');
- $projects = $this->readProjectTokens($saved_query);
-
- $form
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setName('callsigns')
- ->setLabel(pht('Callsigns'))
- ->setValue(implode(', ', $callsigns)))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setName('name')
- ->setLabel(pht('Name Contains'))
- ->setValue($name))
- ->appendControl(
- id(new AphrontFormTokenizerControl())
- ->setDatasource(new PhabricatorProjectLogicalDatasource())
- ->setName('projects')
- ->setLabel(pht('Projects'))
- ->setValue($projects))
- ->appendChild(
- id(new AphrontFormSelectControl())
- ->setName('status')
- ->setLabel(pht('Status'))
- ->setValue($saved_query->getParameter('status'))
- ->setOptions($this->getStatusOptions()))
- ->appendChild(
- id(new AphrontFormSelectControl())
- ->setName('hosted')
- ->setLabel(pht('Hosted'))
- ->setValue($saved_query->getParameter('hosted'))
- ->setOptions($this->getHostedOptions()));
-
- $type_control = id(new AphrontFormCheckboxControl())
- ->setLabel(pht('Types'));
-
- $all_types = PhabricatorRepositoryType::getAllRepositoryTypes();
- foreach ($all_types as $key => $name) {
- $type_control->addCheckbox(
- 'types[]',
- $key,
- $name,
- isset($types[$key]));
+ if (strlen($map['name'])) {
+ $query->withNameContains($map['name']);
}
- $form->appendChild($type_control);
- $this->appendOrderFieldsToForm(
- $form,
- $saved_query,
- new PhabricatorRepositoryQuery());
+ return $query;
}
protected function getURI($path) {
@@ -268,15 +212,20 @@
return $list;
}
- private function readProjectTokens(PhabricatorSavedQuery $saved) {
- $projects = $saved->getParameter('projects', array());
+ protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {
+ $project_phids = $saved->getParameter('projectPHIDs', array());
+
+ $old = $saved->getParameter('projects', array());
+ foreach ($old as $phid) {
+ $project_phids[] = $phid;
+ }
$any = $saved->getParameter('anyProjectPHIDs', array());
foreach ($any as $project) {
- $projects[] = 'any('.$project.')';
+ $project_phids[] = 'any('.$project.')';
}
- return $projects;
+ $saved->setParameter('projectPHIDs', $project_phids);
}
}
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -108,6 +108,9 @@
* @return The result of the query.
*/
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
+ $saved = clone $saved;
+ $this->willUseSavedQuery($saved);
+
$fields = $this->buildSearchFields();
$viewer = $this->requireViewer();
@@ -153,11 +156,36 @@
$this->applyCustomFieldsToQuery($query, $saved);
}
- $this->setQueryOrder($query, $saved);
+ $order = $saved->getParameter('order');
+ $builtin = $query->getBuiltinOrders();
+ if (strlen($order) && isset($builtin[$order])) {
+ $query->setOrder($order);
+ } else {
+ // If the order is invalid or not available, we choose the first
+ // builtin order. This isn't always the default order for the query,
+ // but is the first value in the "Order" dropdown, and makes the query
+ // behavior more consistent with the UI. In queries where the two
+ // orders differ, this order is the preferred order for humans.
+ $query->setOrder(head_key($builtin));
+ }
return $query;
}
+ /**
+ * Hook for subclasses to adjust saved queries prior to use.
+ *
+ * If an application changes how queries are saved, it can implement this
+ * hook to keep old queries working the way users expect, by reading,
+ * adjusting, and overwriting parameters.
+ *
+ * @param PhabricatorSavedQuery Saved query which will be executed.
+ * @return void
+ */
+ protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {
+ return;
+ }
+
protected function buildQueryFromParameters(array $parameters) {
throw new PhutilMethodNotImplementedException();
}
@@ -173,6 +201,9 @@
AphrontFormView $form,
PhabricatorSavedQuery $saved) {
+ $saved = clone $saved;
+ $this->willUseSavedQuery($saved);
+
$fields = $this->buildSearchFields();
$viewer = $this->requireViewer();
@@ -889,50 +920,6 @@
}
-/* -( Result Ordering )---------------------------------------------------- */
-
- /**
- * Set query ordering from a saved value.
- */
- protected function setQueryOrder(
- PhabricatorCursorPagedPolicyAwareQuery $query,
- PhabricatorSavedQuery $saved) {
-
- $order = $saved->getParameter('order');
- $builtin = $query->getBuiltinOrders();
-
- if (strlen($order) && isset($builtin[$order])) {
- $query->setOrder($order);
- } else {
- // If the order is invalid or not available, we choose the first
- // builtin order. This isn't always the default order for the query,
- // but is the first value in the "Order" dropdown, and makes the query
- // behavior more consistent with the UI. In queries where the two
- // orders differ, this order is the preferred order for humans.
- $query->setOrder(head_key($builtin));
- }
-
- return $this;
- }
-
-
-
- protected function appendOrderFieldsToForm(
- AphrontFormView $form,
- PhabricatorSavedQuery $saved,
- PhabricatorCursorPagedPolicyAwareQuery $query) {
-
- $orders = $query->getBuiltinOrders();
- $orders = ipull($orders, 'name');
-
- $form->appendControl(
- id(new AphrontFormSelectControl())
- ->setLabel(pht('Order'))
- ->setName('order')
- ->setOptions($orders)
- ->setValue($saved->getParameter('order')));
- }
-
/* -( Paging and Executing Queries )--------------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 4:32 PM (6 d, 4 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7322356
Default Alt Text
D13196.id.diff (14 KB)

Event Timeline

Phabricator · Built by Phacility