Minor, move all storage/query/db code to src/infrastructure/storage

src/__phutil_library_map__.php

@@ -23,8 +23,8 @@ phutil_register_library_map(array(
     'AphrontContextBarView' => 'view/layout/AphrontContextBarView.php',
     'AphrontController' => 'aphront/AphrontController.php',
     'AphrontCrumbsView' => 'view/layout/AphrontCrumbsView.php',
-    'AphrontDatabaseConnection' => 'storage/connection/AphrontDatabaseConnection.php',
-    'AphrontDatabaseTransactionState' => 'storage/AphrontDatabaseTransactionState.php',
+    'AphrontDatabaseConnection' => 'infrastructure/storage/connection/AphrontDatabaseConnection.php',
+    'AphrontDatabaseTransactionState' => 'infrastructure/storage/connection/AphrontDatabaseTransactionState.php',
     'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php',
     'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
     'AphrontDialogView' => 'view/AphrontDialogView.php',
@@ -60,8 +60,8 @@ phutil_register_library_map(array(
     'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php',
     'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.php',
     'AphrontIDPagerView' => 'view/control/AphrontIDPagerView.php',
-    'AphrontIsolatedDatabaseConnection' => 'storage/connection/AphrontIsolatedDatabaseConnection.php',
-    'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
+    'AphrontIsolatedDatabaseConnection' => 'infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php',
+    'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
     'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
     'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
     'AphrontJavelinView' => 'view/AphrontJavelinView.php',
@@ -69,10 +69,10 @@ phutil_register_library_map(array(
     'AphrontListFilterView' => 'view/layout/AphrontListFilterView.php',
     'AphrontMiniPanelView' => 'view/layout/AphrontMiniPanelView.php',
     'AphrontMoreView' => 'view/layout/AphrontMoreView.php',
-    'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLDatabaseConnection.php',
-    'AphrontMySQLDatabaseConnectionBase' => 'storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php',
-    'AphrontMySQLDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
-    'AphrontMySQLiDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLiDatabaseConnection.php',
+    'AphrontMySQLDatabaseConnection' => 'infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnection.php',
+    'AphrontMySQLDatabaseConnectionBase' => 'infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php',
+    'AphrontMySQLDatabaseConnectionTestCase' => 'infrastructure/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
+    'AphrontMySQLiDatabaseConnection' => 'infrastructure/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php',
     'AphrontNullView' => 'view/AphrontNullView.php',
     'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php',
     'AphrontPageView' => 'view/page/AphrontPageView.php',
@@ -80,17 +80,17 @@ phutil_register_library_map(array(
     'AphrontPanelView' => 'view/layout/AphrontPanelView.php',
     'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php',
     'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php',
-    'AphrontQueryAccessDeniedException' => 'storage/exception/AphrontQueryAccessDeniedException.php',
-    'AphrontQueryConnectionException' => 'storage/exception/AphrontQueryConnectionException.php',
-    'AphrontQueryConnectionLostException' => 'storage/exception/AphrontQueryConnectionLostException.php',
-    'AphrontQueryCountException' => 'storage/exception/AphrontQueryCountException.php',
-    'AphrontQueryDeadlockException' => 'storage/exception/AphrontQueryDeadlockException.php',
-    'AphrontQueryDuplicateKeyException' => 'storage/exception/AphrontQueryDuplicateKeyException.php',
-    'AphrontQueryException' => 'storage/exception/AphrontQueryException.php',
-    'AphrontQueryObjectMissingException' => 'storage/exception/AphrontQueryObjectMissingException.php',
-    'AphrontQueryParameterException' => 'storage/exception/AphrontQueryParameterException.php',
-    'AphrontQueryRecoverableException' => 'storage/exception/AphrontQueryRecoverableException.php',
-    'AphrontQuerySchemaException' => 'storage/exception/AphrontQuerySchemaException.php',
+    'AphrontQueryAccessDeniedException' => 'infrastructure/storage/exception/AphrontQueryAccessDeniedException.php',
+    'AphrontQueryConnectionException' => 'infrastructure/storage/exception/AphrontQueryConnectionException.php',
+    'AphrontQueryConnectionLostException' => 'infrastructure/storage/exception/AphrontQueryConnectionLostException.php',
+    'AphrontQueryCountException' => 'infrastructure/storage/exception/AphrontQueryCountException.php',
+    'AphrontQueryDeadlockException' => 'infrastructure/storage/exception/AphrontQueryDeadlockException.php',
+    'AphrontQueryDuplicateKeyException' => 'infrastructure/storage/exception/AphrontQueryDuplicateKeyException.php',
+    'AphrontQueryException' => 'infrastructure/storage/exception/AphrontQueryException.php',
+    'AphrontQueryObjectMissingException' => 'infrastructure/storage/exception/AphrontQueryObjectMissingException.php',
+    'AphrontQueryParameterException' => 'infrastructure/storage/exception/AphrontQueryParameterException.php',
+    'AphrontQueryRecoverableException' => 'infrastructure/storage/exception/AphrontQueryRecoverableException.php',
+    'AphrontQuerySchemaException' => 'infrastructure/storage/exception/AphrontQuerySchemaException.php',
     'AphrontRedirectException' => 'aphront/exception/AphrontRedirectException.php',
     'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php',
     'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
@@ -215,8 +215,8 @@ phutil_register_library_map(array(
     'DarkConsoleServicesPlugin' => 'aphront/console/plugin/DarkConsoleServicesPlugin.php',
     'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/DarkConsoleXHProfPlugin.php',
     'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php',
-    'DatabaseConfigurationProvider' => 'applications/base/storage/configuration/DatabaseConfigurationProvider.php',
-    'DefaultDatabaseConfigurationProvider' => 'applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php',
+    'DatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DatabaseConfigurationProvider.php',
+    'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php',
     'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
     'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php',
     'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
@@ -483,13 +483,13 @@ phutil_register_library_map(array(
     'JavelinReactorExample' => 'applications/uiexample/examples/JavelinReactorExample.php',
     'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php',
     'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php',
-    'LiskDAO' => 'storage/lisk/LiskDAO.php',
-    'LiskDAOSet' => 'storage/lisk/LiskDAOSet.php',
-    'LiskEphemeralObjectException' => 'storage/lisk/LiskEphemeralObjectException.php',
-    'LiskFixtureTestCase' => 'storage/lisk/__tests__/LiskFixtureTestCase.php',
-    'LiskIsolationTestCase' => 'storage/lisk/__tests__/LiskIsolationTestCase.php',
-    'LiskIsolationTestDAO' => 'storage/lisk/__tests__/LiskIsolationTestDAO.php',
-    'LiskIsolationTestDAOException' => 'storage/lisk/__tests__/LiskIsolationTestDAOException.php',
+    'LiskDAO' => 'infrastructure/storage/lisk/LiskDAO.php',
+    'LiskDAOSet' => 'infrastructure/storage/lisk/LiskDAOSet.php',
+    'LiskEphemeralObjectException' => 'infrastructure/storage/lisk/LiskEphemeralObjectException.php',
+    'LiskFixtureTestCase' => 'infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php',
+    'LiskIsolationTestCase' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php',
+    'LiskIsolationTestDAO' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php',
+    'LiskIsolationTestDAOException' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php',
     'ManiphestAction' => 'applications/maniphest/constants/ManiphestAction.php',
     'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php',
     'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php',
@@ -560,7 +560,7 @@ phutil_register_library_map(array(
     'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
     'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
     'PhabricatorBaseEnglishTranslation' => 'infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php',
-    'PhabricatorBuiltinPatchList' => 'infrastructure/setup/sql/PhabricatorBuiltinPatchList.php',
+    'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
     'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
     'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
     'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
@@ -720,7 +720,7 @@ phutil_register_library_map(array(
     'PhabricatorLDAPRegistrationController' => 'applications/auth/controller/PhabricatorLDAPRegistrationController.php',
     'PhabricatorLDAPUnlinkController' => 'applications/auth/controller/PhabricatorLDAPUnlinkController.php',
     'PhabricatorLintEngine' => 'infrastructure/lint/PhabricatorLintEngine.php',
-    'PhabricatorLiskDAO' => 'applications/base/storage/PhabricatorLiskDAO.php',
+    'PhabricatorLiskDAO' => 'infrastructure/storage/lisk/PhabricatorLiskDAO.php',
     'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
     'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
     'PhabricatorLoginController' => 'applications/auth/controller/PhabricatorLoginController.php',
@@ -917,7 +917,7 @@ phutil_register_library_map(array(
     'PhabricatorRepositoryTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php',
     'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php',
     'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php',
-    'PhabricatorSQLPatchList' => 'infrastructure/setup/sql/PhabricatorSQLPatchList.php',
+    'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php',
     'PhabricatorScopedEnv' => 'infrastructure/PhabricatorScopedEnv.php',
     'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
     'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php',
@@ -960,14 +960,14 @@ phutil_register_library_map(array(
     'PhabricatorStandardPageView' => 'view/page/PhabricatorStandardPageView.php',
     'PhabricatorStatusController' => 'applications/status/PhabricatorStatusController.php',
     'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php',
-    'PhabricatorStorageManagementAPI' => 'infrastructure/setup/storage/PhabricatorStorageManagementAPI.php',
-    'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
-    'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
-    'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php',
-    'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php',
-    'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php',
-    'PhabricatorStorageManagementWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php',
-    'PhabricatorStoragePatch' => 'infrastructure/setup/storage/PhabricatorStoragePatch.php',
+    'PhabricatorStorageManagementAPI' => 'infrastructure/storage/management/PhabricatorStorageManagementAPI.php',
+    'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
+    'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
+    'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php',
+    'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php',
+    'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php',
+    'PhabricatorStorageManagementWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php',
+    'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php',
     'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
     'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
     'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
@@ -1072,13 +1072,13 @@ phutil_register_library_map(array(
     'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
     'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
     'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
-    'QueryFormattingTestCase' => 'storage/__tests__/QueryFormattingTestCase.php',
+    'QueryFormattingTestCase' => 'infrastructure/storage/query/__tests__/QueryFormattingTestCase.php',
   ),
   'function' =>
   array(
     '_phabricator_date_format' => 'view/viewutils.php',
-    '_qsprintf_check_scalar_type' => 'storage/qsprintf.php',
-    '_qsprintf_check_type' => 'storage/qsprintf.php',
+    '_qsprintf_check_scalar_type' => 'infrastructure/storage/query/qsprintf.php',
+    '_qsprintf_check_type' => 'infrastructure/storage/query/qsprintf.php',
     'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php',
     'celerity_get_resource_uri' => 'infrastructure/celerity/api.php',
     'celerity_register_resource_map' => 'infrastructure/celerity/map.php',
@@ -1097,15 +1097,15 @@ phutil_register_library_map(array(
     'phabricator_time' => 'view/viewutils.php',
     'phid_get_type' => 'applications/phid/utils.php',
     'phid_group_by_type' => 'applications/phid/utils.php',
-    'qsprintf' => 'storage/qsprintf.php',
-    'queryfx' => 'storage/queryfx.php',
-    'queryfx_all' => 'storage/queryfx.php',
-    'queryfx_one' => 'storage/queryfx.php',
+    'qsprintf' => 'infrastructure/storage/query/qsprintf.php',
+    'queryfx' => 'infrastructure/storage/query/queryfx.php',
+    'queryfx_all' => 'infrastructure/storage/query/queryfx.php',
+    'queryfx_one' => 'infrastructure/storage/query/queryfx.php',
     'require_celerity_resource' => 'infrastructure/celerity/api.php',
-    'vqsprintf' => 'storage/qsprintf.php',
-    'vqueryfx' => 'storage/queryfx.php',
-    'vqueryfx_all' => 'storage/queryfx.php',
-    'xsprintf_query' => 'storage/qsprintf.php',
+    'vqsprintf' => 'infrastructure/storage/query/qsprintf.php',
+    'vqueryfx' => 'infrastructure/storage/query/queryfx.php',
+    'vqueryfx_all' => 'infrastructure/storage/query/queryfx.php',
+    'xsprintf_query' => 'infrastructure/storage/query/qsprintf.php',
   ),
   'xmap' =>
   array(