From 8fd098329ba2c3bb13485cacbc0e0530c84fb1b8 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 6 Aug 2014 07:51:21 +1000 Subject: [PATCH] Rename `AphrontQueryException` subclasses Summary: Ref T5655. Depends on D10149. Test Plan: Ran `arc unit` Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin, hach-que Maniphest Tasks: T5655 Differential Revision: https://secure.phabricator.com/D10150 --- resources/sql/patches/090.forceuniqueprojectnames.php | 2 +- .../sql/patches/20130913.maniphest.1.migratesearch.php | 2 +- src/__tests__/PhabricatorInfrastructureTestCase.php | 4 ++-- .../AphrontDefaultApplicationConfiguration.php | 2 +- .../auth/controller/PhabricatorAuthRegisterController.php | 2 +- .../config/check/PhabricatorSetupCheckDatabase.php | 2 +- .../differential/storage/DifferentialDraft.php | 2 +- .../herald/controller/HeraldRuleController.php | 2 +- .../macro/controller/PhabricatorMacroEditController.php | 2 +- .../controller/PhabricatorMailingListsEditController.php | 2 +- .../owners/controller/PhabricatorOwnersEditController.php | 2 +- .../people/controller/PhabricatorPeopleNewController.php | 2 +- .../controller/PhabricatorPeopleRenameController.php | 2 +- src/applications/people/editor/PhabricatorUserEditor.php | 6 +++--- .../people/lipsum/PhabricatorPeopleTestDataGenerator.php | 2 +- .../phame/controller/blog/PhameBlogEditController.php | 2 +- .../phame/controller/post/PhamePostEditController.php | 2 +- src/applications/phlux/controller/PhluxEditController.php | 2 +- .../controller/PhragmentSnapshotCreateController.php | 2 +- .../controller/product/ReleephProductCreateController.php | 2 +- .../conduit/RepositoryCreateConduitAPIMethod.php | 2 +- .../engine/PhabricatorRepositoryDiscoveryEngine.php | 2 +- .../search/controller/PhabricatorSearchController.php | 2 +- .../search/engine/PhabricatorApplicationSearchEngine.php | 2 +- .../panel/PhabricatorSettingsPanelEmailAddresses.php | 2 +- .../settings/panel/PhabricatorSettingsPanelSSHKeys.php | 2 +- .../AphrontIsolatedDatabaseConnectionTestCase.php | 2 +- .../__tests__/AphrontMySQLDatabaseConnectionTestCase.php | 2 +- src/infrastructure/storage/lisk/LiskDAO.php | 8 ++++---- 29 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/sql/patches/090.forceuniqueprojectnames.php b/resources/sql/patches/090.forceuniqueprojectnames.php index f8a7508d99..c3881ad011 100644 --- a/resources/sql/patches/090.forceuniqueprojectnames.php +++ b/resources/sql/patches/090.forceuniqueprojectnames.php @@ -58,7 +58,7 @@ while ($update) { $project->getID()); unset($update[$key]); echo "okay.\n"; - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { echo "failed, will retry.\n"; } } diff --git a/resources/sql/patches/20130913.maniphest.1.migratesearch.php b/resources/sql/patches/20130913.maniphest.1.migratesearch.php index 7f7be6d505..1f7e7c78f8 100644 --- a/resources/sql/patches/20130913.maniphest.1.migratesearch.php +++ b/resources/sql/patches/20130913.maniphest.1.migratesearch.php @@ -187,7 +187,7 @@ foreach ($rows as $row) { try { $saved->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { // Ignore this, we just have duplicate saved queries. } diff --git a/src/__tests__/PhabricatorInfrastructureTestCase.php b/src/__tests__/PhabricatorInfrastructureTestCase.php index 759dbb2059..d90e004af4 100644 --- a/src/__tests__/PhabricatorInfrastructureTestCase.php +++ b/src/__tests__/PhabricatorInfrastructureTestCase.php @@ -113,11 +113,11 @@ final class PhabricatorInfrastructureTestCase extends PhabricatorTestCase { $caught = null; try { qsprintf($conn_r, 'SELECT %s', $gclef); - } catch (AphrontQueryCharacterSetException $ex) { + } catch (AphrontCharacterSetQueryException $ex) { $caught = $ex; } - $this->assertTrue($caught instanceof AphrontQueryCharacterSetException); + $this->assertTrue($caught instanceof AphrontCharacterSetQueryException); } } diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 95b124c5e8..5035cae8ad 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -250,7 +250,7 @@ class AphrontDefaultApplicationConfiguration $class = get_class($ex); $message = $ex->getMessage(); - if ($ex instanceof AphrontQuerySchemaException) { + if ($ex instanceof AphrontSchemaQueryException) { $message .= "\n\n". "NOTE: This usually indicates that the MySQL schema has not been ". diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php index a481a5df30..b76a27d812 100644 --- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php +++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php @@ -304,7 +304,7 @@ final class PhabricatorAuthRegisterController } return $this->loginUser($user); - } catch (AphrontQueryDuplicateKeyException $exception) { + } catch (AphrontDuplicateKeyQueryException $exception) { $same_username = id(new PhabricatorUser())->loadOneWhere( 'userName = %s', $user->getUserName()); diff --git a/src/applications/config/check/PhabricatorSetupCheckDatabase.php b/src/applications/config/check/PhabricatorSetupCheckDatabase.php index 9d2b9c731e..0361acdc4c 100644 --- a/src/applications/config/check/PhabricatorSetupCheckDatabase.php +++ b/src/applications/config/check/PhabricatorSetupCheckDatabase.php @@ -30,7 +30,7 @@ final class PhabricatorSetupCheckDatabase extends PhabricatorSetupCheck { try { queryfx($conn_raw, 'SELECT 1'); - } catch (AphrontQueryConnectionException $ex) { + } catch (AphrontConnectionQueryException $ex) { $message = pht( "Unable to connect to MySQL!\n\n". "%s\n\n". diff --git a/src/applications/differential/storage/DifferentialDraft.php b/src/applications/differential/storage/DifferentialDraft.php index 4831d8a5f9..6ad406d3f0 100644 --- a/src/applications/differential/storage/DifferentialDraft.php +++ b/src/applications/differential/storage/DifferentialDraft.php @@ -16,7 +16,7 @@ final class DifferentialDraft extends DifferentialDAO { ->setAuthorPHID($author_phid) ->setDraftKey($draft_key) ->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { // no worries } } diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php index 5a701e44c6..b3be8ae643 100644 --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -333,7 +333,7 @@ final class HeraldRuleController extends HeraldController { $rule->logEdit($request->getUser()->getPHID(), $edit_action); $rule->saveTransaction(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_name = pht('Not Unique'); $errors[] = pht('Rule name is not unique. Choose a unique name.'); } diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php index 287d8e6560..79393c7536 100644 --- a/src/applications/macro/controller/PhabricatorMacroEditController.php +++ b/src/applications/macro/controller/PhabricatorMacroEditController.php @@ -125,7 +125,7 @@ final class PhabricatorMacroEditController extends PhabricatorMacroController { $view_uri = $this->getApplicationURI('/view/'.$original->getID().'/'); return id(new AphrontRedirectResponse())->setURI($view_uri); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { throw $ex; $errors[] = pht('Macro name is not unique!'); $e_name = pht('Duplicate'); diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php index 402e16f554..b0a82e7887 100644 --- a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php @@ -67,7 +67,7 @@ final class PhabricatorMailingListsEditController $list->save(); return id(new AphrontRedirectResponse()) ->setURI($this->getApplicationURI()); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_email = pht('Duplicate'); $errors[] = pht('Another mailing list already uses that address.'); } diff --git a/src/applications/owners/controller/PhabricatorOwnersEditController.php b/src/applications/owners/controller/PhabricatorOwnersEditController.php index aface6a277..10ce29c9a5 100644 --- a/src/applications/owners/controller/PhabricatorOwnersEditController.php +++ b/src/applications/owners/controller/PhabricatorOwnersEditController.php @@ -92,7 +92,7 @@ final class PhabricatorOwnersEditController $package->save(); return id(new AphrontRedirectResponse()) ->setURI('/owners/package/'.$package->getID().'/'); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_name = pht('Duplicate'); $errors[] = pht('Package name must be unique.'); } diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php index 2eef703485..a766f3fdd3 100644 --- a/src/applications/people/controller/PhabricatorPeopleNewController.php +++ b/src/applications/people/controller/PhabricatorPeopleNewController.php @@ -104,7 +104,7 @@ final class PhabricatorPeopleNewController $response = id(new AphrontRedirectResponse()) ->setURI('/p/'.$user->getUsername().'/'); return $response; - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $errors[] = pht('Username and email must be unique.'); $same_username = id(new PhabricatorUser()) diff --git a/src/applications/people/controller/PhabricatorPeopleRenameController.php b/src/applications/people/controller/PhabricatorPeopleRenameController.php index 873ddeeb5f..aef56c295e 100644 --- a/src/applications/people/controller/PhabricatorPeopleRenameController.php +++ b/src/applications/people/controller/PhabricatorPeopleRenameController.php @@ -56,7 +56,7 @@ final class PhabricatorPeopleRenameController $new_uri = '/p/'.$v_username.'/'; return id(new AphrontRedirectResponse())->setURI($new_uri); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_username = pht('Not Unique'); $errors[] = pht('Another user already has that username.'); } diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php index aafb20a7e2..ed038ee59c 100644 --- a/src/applications/people/editor/PhabricatorUserEditor.php +++ b/src/applications/people/editor/PhabricatorUserEditor.php @@ -54,7 +54,7 @@ final class PhabricatorUserEditor extends PhabricatorEditor { $user->save(); $email->setUserPHID($user->getPHID()); $email->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { // We might have written the user but failed to write the email; if // so, erase the IDs we attached. $user->setID(null); @@ -155,7 +155,7 @@ final class PhabricatorUserEditor extends PhabricatorEditor { try { $user->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $user->setUsername($old_username); $user->killTransaction(); throw $ex; @@ -365,7 +365,7 @@ final class PhabricatorUserEditor extends PhabricatorEditor { try { $email->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $user->endWriteLocking(); $user->killTransaction(); diff --git a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php index 410d46ae12..c3236b81f7 100644 --- a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php +++ b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php @@ -25,7 +25,7 @@ final class PhabricatorPeopleTestDataGenerator ->createNewUser($user, $email_object); return $user; - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { } } } diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php index ded6f90f2d..4eb91bb098 100644 --- a/src/applications/phame/controller/blog/PhameBlogEditController.php +++ b/src/applications/phame/controller/blog/PhameBlogEditController.php @@ -96,7 +96,7 @@ final class PhameBlogEditController $blog->save(); return id(new AphrontRedirectResponse()) ->setURI($this->getApplicationURI('blog/view/'.$blog->getID().'/')); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $errors[] = pht('Domain must be unique.'); $e_custom_domain = pht('Not Unique'); } diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php index 165ec3894a..6483ae6136 100644 --- a/src/applications/phame/controller/post/PhamePostEditController.php +++ b/src/applications/phame/controller/post/PhamePostEditController.php @@ -82,7 +82,7 @@ final class PhamePostEditController extends PhameController { $uri = $this->getApplicationURI('/post/view/'.$post->getID().'/'); return id(new AphrontRedirectResponse())->setURI($uri); - } catch (AphrontQueryDuplicateKeyException $e) { + } catch (AphrontDuplicateKeyQueryException $e) { $e_phame_title = pht('Not Unique'); $errors[] = pht('Another post already uses this slug. '. 'Each post must have a unique slug.'); diff --git a/src/applications/phlux/controller/PhluxEditController.php b/src/applications/phlux/controller/PhluxEditController.php index ba1fcd8de5..ac64ffcaa2 100644 --- a/src/applications/phlux/controller/PhluxEditController.php +++ b/src/applications/phlux/controller/PhluxEditController.php @@ -92,7 +92,7 @@ final class PhluxEditController extends PhluxController { $editor->applyTransactions($var, $xactions); $view_uri = $this->getApplicationURI('/view/'.$key.'/'); return id(new AphrontRedirectResponse())->setURI($view_uri); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_key = pht('Not Unique'); $errors[] = pht('Variable key must be unique.'); } diff --git a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php index f8ec634e4b..b86be02e30 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php @@ -52,7 +52,7 @@ final class PhragmentSnapshotCreateController extends PhragmentController { ->setPrimaryFragmentPHID($fragment->getPHID()) ->setName($v_name) ->save(); - } catch (AphrontQueryDuplicateKeyException $e) { + } catch (AphrontDuplicateKeyQueryException $e) { $errors[] = pht('A snapshot with this name already exists.'); } diff --git a/src/applications/releeph/controller/product/ReleephProductCreateController.php b/src/applications/releeph/controller/product/ReleephProductCreateController.php index 1a410187d0..6168c5fa1e 100644 --- a/src/applications/releeph/controller/product/ReleephProductCreateController.php +++ b/src/applications/releeph/controller/product/ReleephProductCreateController.php @@ -44,7 +44,7 @@ final class ReleephProductCreateController extends ReleephProductController { return id(new AphrontRedirectResponse()) ->setURI($releeph_product->getURI()); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_name = pht('Not Unique'); $errors[] = pht('Another product already uses this name.'); } diff --git a/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php b/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php index a6e8fe0d96..2d8a40c6d4 100644 --- a/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php +++ b/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php @@ -134,7 +134,7 @@ final class RepositoryCreateConduitAPIMethod try { $repository->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { throw new ConduitException('ERR-DUPLICATE'); } diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php index 18b54a3c59..15dbb0f757 100644 --- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php +++ b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php @@ -632,7 +632,7 @@ final class PhabricatorRepositoryDiscoveryEngine - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $commit->killTransaction(); // Ignore. This can happen because we discover the same new commit // more than once when looking at history, or because of races or diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php index c6e0745d26..bad363c36d 100644 --- a/src/applications/search/controller/PhabricatorSearchController.php +++ b/src/applications/search/controller/PhabricatorSearchController.php @@ -59,7 +59,7 @@ final class PhabricatorSearchController $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); try { $saved->setID(null)->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { // Ignore, this is just a repeated search. } unset($unguarded); diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php index d7327c67d7..adc0b9146e 100644 --- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php +++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php @@ -52,7 +52,7 @@ abstract class PhabricatorApplicationSearchEngine { $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); try { $query->save(); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { // Ignore, this is just a repeated search. } unset($unguarded); diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php index c4a7ecf419..d5966f8eaa 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php @@ -210,7 +210,7 @@ final class PhabricatorSettingsPanelEmailAddresses ->addSubmitButton(pht('Done')); return id(new AphrontDialogResponse())->setDialog($dialog); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $email = pht('Duplicate'); $errors[] = pht('Another user already has this email.'); } diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php index ae0af29505..c285b749b9 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php @@ -103,7 +103,7 @@ final class PhabricatorSettingsPanelSSHKeys $key->save(); return id(new AphrontRedirectResponse()) ->setURI($this->getPanelURI()); - } catch (AphrontQueryDuplicateKeyException $ex) { + } catch (AphrontDuplicateKeyQueryException $ex) { $e_key = pht('Duplicate'); $errors[] = pht('This public key is already associated with a user '. 'account.'); diff --git a/src/infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php b/src/infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php index 56457ceceb..ed3c8560d5 100644 --- a/src/infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php +++ b/src/infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php @@ -134,7 +134,7 @@ final class AphrontIsolatedDatabaseConnectionTestCase null, $row, 'Expect fake row to exist only in isolation.'); - } catch (AphrontQueryConnectionException $ex) { + } catch (AphrontConnectionQueryException $ex) { // If we can't connect to the database, conclude that the isolated // connection actually is isolated. Philosophically, this perhaps allows // us to claim this test does not depend on the database? diff --git a/src/infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php b/src/infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php index d78737c2f6..ec238ecd59 100644 --- a/src/infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php +++ b/src/infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php @@ -28,7 +28,7 @@ final class AphrontMySQLDatabaseConnectionTestCase $caught = null; try { queryfx($conn, 'SELECT 1'); - } catch (AphrontQueryConnectionLostException $ex) { + } catch (AphrontConnectionLostQueryException $ex) { $caught = $ex; } $this->assertTrue($caught instanceof Exception); diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php index b3f54d0817..52b72f228f 100644 --- a/src/infrastructure/storage/lisk/LiskDAO.php +++ b/src/infrastructure/storage/lisk/LiskDAO.php @@ -460,7 +460,7 @@ abstract class LiskDAO { $args); if (count($data) > 1) { - throw new AphrontQueryCountException( + throw new AphrontCountQueryException( 'More than 1 result from loadOneWhere()!'); } @@ -517,7 +517,7 @@ abstract class LiskDAO { $this->getID()); if (!$result) { - throw new AphrontQueryObjectMissingException(); + throw new AphrontObjectMissingQueryException(); } return $this; @@ -771,7 +771,7 @@ abstract class LiskDAO { } if (count($relatives) > 1) { - throw new AphrontQueryCountException( + throw new AphrontCountQueryException( 'More than 1 result from loadOneRelative()!'); } @@ -1183,7 +1183,7 @@ abstract class LiskDAO { } else { $data[$key] = qsprintf($conn, '%ns', $value); } - } catch (AphrontQueryParameterException $parameter_exception) { + } catch (AphrontParameterQueryException $parameter_exception) { throw new PhutilProxyException( pht( "Unable to insert or update object of class %s, field '%s' ".