recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix ambiguous column names in Maniphest blocking queries

Summary: Fixes T7421. Now that we join the task table again to ignore //closed// blockers, all the column names are ambiguous. Make them unambiguous.

Test Plan: Issued some searches with various different parameters.

Reviewers: btrahan, joshuaspence, chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T7421

Differential Revision: https://secure.phabricator.com/D11922

epriestley bb6eb9bf 18340d9c

+26 -26
+26 -26
src/applications/maniphest/query/ManiphestTaskQuery.php
··· 438 438 439 439 return qsprintf( 440 440 $conn, 441 - 'id in (%Ld)', 441 + 'task.id in (%Ld)', 442 442 $this->taskIDs); 443 443 } 444 444 ··· 449 449 450 450 return qsprintf( 451 451 $conn, 452 - 'phid in (%Ls)', 452 + 'task.phid in (%Ls)', 453 453 $this->taskPHIDs); 454 454 } 455 455 ··· 468 468 case self::STATUS_OPEN: 469 469 return qsprintf( 470 470 $conn, 471 - 'status IN (%Ls)', 471 + 'task.status IN (%Ls)', 472 472 ManiphestTaskStatus::getOpenStatusConstants()); 473 473 case self::STATUS_CLOSED: 474 474 return qsprintf( 475 475 $conn, 476 - 'status IN (%Ls)', 476 + 'task.status IN (%Ls)', 477 477 ManiphestTaskStatus::getClosedStatusConstants()); 478 478 default: 479 479 $constant = idx($map, $this->status); ··· 482 482 } 483 483 return qsprintf( 484 484 $conn, 485 - 'status = %s', 485 + 'task.status = %s', 486 486 $constant); 487 487 } 488 488 } ··· 491 491 if ($this->statuses) { 492 492 return qsprintf( 493 493 $conn, 494 - 'status IN (%Ls)', 494 + 'task.status IN (%Ls)', 495 495 $this->statuses); 496 496 } 497 497 return null; ··· 501 501 if ($this->priorities) { 502 502 return qsprintf( 503 503 $conn, 504 - 'priority IN (%Ld)', 504 + 'task.priority IN (%Ld)', 505 505 $this->priorities); 506 506 } 507 507 ··· 515 515 516 516 return qsprintf( 517 517 $conn, 518 - 'authorPHID in (%Ls)', 518 + 'task.authorPHID in (%Ls)', 519 519 $this->authorPHIDs); 520 520 } 521 521 ··· 526 526 } else if ($this->includeUnowned) { 527 527 return qsprintf( 528 528 $conn, 529 - 'ownerPHID IS NULL'); 529 + 'task.ownerPHID IS NULL'); 530 530 } else { 531 531 return qsprintf( 532 532 $conn, 533 - 'ownerPHID IS NOT NULL'); 533 + 'task.ownerPHID IS NOT NULL'); 534 534 } 535 535 } 536 536 537 537 if ($this->includeUnowned) { 538 538 return qsprintf( 539 539 $conn, 540 - 'ownerPHID IN (%Ls) OR ownerPHID IS NULL', 540 + 'task.ownerPHID IN (%Ls) OR task.ownerPHID IS NULL', 541 541 $this->ownerPHIDs); 542 542 } else { 543 543 return qsprintf( 544 544 $conn, 545 - 'ownerPHID IN (%Ls)', 545 + 'task.ownerPHID IN (%Ls)', 546 546 $this->ownerPHIDs); 547 547 } 548 548 } ··· 572 572 573 573 return qsprintf( 574 574 $conn, 575 - 'phid IN (%Ls)', 575 + 'task.phid IN (%Ls)', 576 576 $fulltext_results); 577 577 } 578 578 ··· 680 680 case self::GROUP_NONE: 681 681 break; 682 682 case self::GROUP_PRIORITY: 683 - $order[] = 'priority'; 683 + $order[] = 'task.priority'; 684 684 break; 685 685 case self::GROUP_OWNER: 686 - $order[] = 'ownerOrdering'; 686 + $order[] = 'task.ownerOrdering'; 687 687 break; 688 688 case self::GROUP_STATUS: 689 - $order[] = 'status'; 689 + $order[] = 'task.status'; 690 690 break; 691 691 case self::GROUP_PROJECT: 692 692 $order[] = '<group.project>'; ··· 700 700 if (!$app_order) { 701 701 switch ($this->orderBy) { 702 702 case self::ORDER_PRIORITY: 703 - $order[] = 'priority'; 704 - $order[] = 'subpriority'; 705 - $order[] = 'dateModified'; 703 + $order[] = 'task.priority'; 704 + $order[] = 'task.subpriority'; 705 + $order[] = 'task.dateModified'; 706 706 break; 707 707 case self::ORDER_CREATED: 708 - $order[] = 'id'; 708 + $order[] = 'task.id'; 709 709 break; 710 710 case self::ORDER_MODIFIED: 711 - $order[] = 'dateModified'; 711 + $order[] = 'task.dateModified'; 712 712 break; 713 713 case self::ORDER_TITLE: 714 - $order[] = 'title'; 714 + $order[] = 'task.title'; 715 715 break; 716 716 default: 717 717 throw new Exception("Unknown order query '{$this->orderBy}'!"); ··· 730 730 case 'ownerOrdering': 731 731 case 'title': 732 732 if ($reverse) { 733 - $order[$k] = "task.{$column} DESC"; 733 + $order[$k] = "{$column} DESC"; 734 734 } else { 735 - $order[$k] = "task.{$column} ASC"; 735 + $order[$k] = "{$column} ASC"; 736 736 } 737 737 break; 738 738 case '<group.project>': ··· 749 749 break; 750 750 default: 751 751 if ($reverse) { 752 - $order[$k] = "task.{$column} ASC"; 752 + $order[$k] = "{$column} ASC"; 753 753 } else { 754 - $order[$k] = "task.{$column} DESC"; 754 + $order[$k] = "{$column} DESC"; 755 755 } 756 756 break; 757 757 }