Page MenuHomePhabricator
Files F13186053

D12351.diff
No OneTemporary
Actions

D12351.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
@@ -304,24 +304,28 @@
break;
case self::ORDER_COMMITTED:
$parts[] = array(
- 'name' => 's.epoch',
+ 'table' => 's',
+ 'column' => 'epoch',
);
break;
case self::ORDER_CALLSIGN:
$parts[] = array(
- 'name' => 'r.callsign',
+ 'table' => 'r',
+ 'column' => 'callsign',
'reverse' => true,
);
break;
case self::ORDER_NAME:
$parts[] = array(
- 'name' => 'r.name',
+ 'table' => 'r',
+ 'column' => 'name',
'reverse' => true,
);
break;
case self::ORDER_SIZE:
$parts[] = array(
- 'name' => 's.size',
+ 'table' => 's',
+ 'column' => 'size',
);
break;
default:
@@ -329,7 +333,8 @@
}
$parts[] = array(
- 'name' => 'r.id',
+ 'table' => 'r',
+ 'column' => 'id',
);
return $this->formatOrderClause($conn, $parts);
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -310,12 +310,21 @@
$descending = !$descending;
}
- $name = $part['name'];
+ $table = idx($part, 'table');
+ $column = $part['column'];
if ($descending) {
- $sql[] = qsprintf($conn, '%Q DESC', $name);
+ if ($table !== null) {
+ $sql[] = qsprintf($conn, '%T.%T DESC', $table, $column);
+ } else {
+ $sql[] = qsprintf($conn, '%T DESC', $column);
+ }
} else {
- $sql[] = qsprintf($conn, '%Q ASC', $name);
+ if ($table !== null) {
+ $sql[] = qsprintf($conn, '%T.%T ASC', $table, $column);
+ } else {
+ $sql[] = qsprintf($conn, '%T ASC', $column);
+ }
}
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 3:23 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6287970
Default Alt Text
D12351.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility