+2 -2

src/applications/files/query/PhabricatorFileQuery.php

reviewed

··· 331 331 return $this->formatWhereClause($where); 332 332 } 333 333 334 334 - protected function getPagingColumn() { 335 335 - return 'f.id'; 334 334 + protected function getPrimaryTableAlias() { 335 335 + return 'f'; 336 336 } 337 337 338 338 public function getQueryApplicationClass() {

+2 -2

src/applications/macro/query/PhabricatorMacroQuery.php

reviewed

··· 225 225 return $macros; 226 226 } 227 227 228 228 - protected function getPagingColumn() { 229 229 - return 'm.id'; 228 228 + protected function getPrimaryTableAlias() { 229 229 + return 'm'; 230 230 } 231 231 232 232 public function getQueryApplicationClass() {

+2 -2

src/applications/maniphest/query/ManiphestTaskQuery.php

reviewed

··· 1137 1137 )); 1138 1138 } 1139 1139 1140 1140 - protected function getApplicationSearchObjectPHIDColumn() { 1141 1141 - return 'task.phid'; 1140 1140 + protected function getPrimaryTableAlias() { 1141 1141 + return 'task'; 1142 1142 } 1143 1143 1144 1144 public function getQueryApplicationClass() {

+2 -6

src/applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php

reviewed

··· 114 114 return $this->formatWhereClause($where); 115 115 } 116 116 117 117 - protected function getPagingColumn() { 118 118 - return 'appemail.id'; 119 119 - } 120 120 - 121 121 - protected function getApplicationSearchObjectPHIDColumn() { 122 122 - return 'appemail.phid'; 117 117 + protected function getPrimaryTableAlias() { 118 118 + return 'appemail'; 123 119 } 124 120 125 121 public function getQueryApplicationClass() {

+2 -6

src/applications/people/query/PhabricatorPeopleQuery.php

reviewed

··· 288 288 return $this->formatWhereClause($where); 289 289 } 290 290 291 291 - protected function getPagingColumn() { 292 292 - return 'user.id'; 293 293 - } 294 294 - 295 295 - protected function getApplicationSearchObjectPHIDColumn() { 296 296 - return 'user.phid'; 291 291 + protected function getPrimaryTableAlias() { 292 292 + return 'user'; 297 293 } 298 294 299 295 public function getQueryApplicationClass() {

+2 -2

src/applications/project/query/PhabricatorProjectQuery.php

reviewed

··· 380 380 return 'PhabricatorProjectApplication'; 381 381 } 382 382 383 383 - protected function getApplicationSearchObjectPHIDColumn() { 384 384 - return 'p.phid'; 383 383 + protected function getPrimaryTableAlias() { 384 384 + return 'p'; 385 385 } 386 386 387 387 }

+2 -2

src/applications/slowvote/query/PhabricatorSlowvoteQuery.php

reviewed

··· 174 174 return implode(' ', $joins); 175 175 } 176 176 177 177 - protected function getPagingColumn() { 178 178 - return 'p.id'; 177 177 + protected function getPrimaryTableAlias() { 178 178 + return 'p'; 179 179 } 180 180 181 181 public function getQueryApplicationClass() {

+28 -5

src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php

reviewed

··· 147 147 } 148 148 149 149 150 150 + /** 151 151 + * Return the alias this query uses to identify the primary table. 152 152 + * 153 153 + * Some automatic query constructions may need to be qualified with a table 154 154 + * alias if the query performs joins which make column names ambiguous. If 155 155 + * this is the case, return the alias for the primary table the query 156 156 + * uses; generally the object table which has `id` and `phid` columns. 157 157 + * 158 158 + * @return string Alias for the primary table. 159 159 + */ 160 160 + protected function getPrimaryTableAlias() { 161 161 + return null; 162 162 + } 163 163 + 164 164 + 150 165 /* -( Paging )------------------------------------------------------------- */ 151 166 152 167 ··· 450 465 451 466 return array( 452 467 'id' => array( 453 453 - 'table' => null, 468 468 + 'table' => $this->getPrimaryTableAlias(), 454 469 'column' => 'id', 455 470 'reverse' => false, 456 471 'type' => 'int', ··· 657 672 658 673 /** 659 674 * Get the name of the query's primary object PHID column, for constructing 660 660 - * JOIN clauses. Normally (and by default) this is just `"phid"`, but if the 661 661 - * query construction requires a table alias it may be something like 662 662 - * `"task.phid"`. 675 675 + * JOIN clauses. Normally (and by default) this is just `"phid"`, but it may 676 676 + * be something more exotic. 677 677 + * 678 678 + * See @{method:getPrimaryTableAlias} if the column needs to be qualified with 679 679 + * a table alias. 663 680 * 664 681 * @return string Column name. 665 682 * @task appsearch 666 683 */ 667 684 protected function getApplicationSearchObjectPHIDColumn() { 668 668 - return 'phid'; 685 685 + if ($this->getPrimaryTableAlias()) { 686 686 + $prefix = $this->getPrimaryTableAlias().'.'; 687 687 + } else { 688 688 + $prefix = ''; 689 689 + } 690 690 + 691 691 + return $prefix.'phid'; 669 692 } 670 693 671 694