Skip to content

[stable22] Lighter SQL requests and compat with Oracle #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 9 commits into from
Closed

[stable22] Lighter SQL requests and compat with Oracle #955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
714f761
fully importing mspt
ArtificialOwl Mar 8, 2022
2b7dc3a
switching import to Tools\
ArtificialOwl Mar 8, 2022
869ea01
population will be stored as settings
ArtificialOwl Mar 8, 2022
8ac231d
removing useless GROUP BY and DISTRINCT
ArtificialOwl Mar 8, 2022
b39e6de
instance can be empty string
ArtificialOwl Mar 8, 2022
3918230
cs-fix
ArtificialOwl Mar 9, 2022
c309af3
Use dependency injection
CarlSchwan Mar 11, 2022
791ba89
Remove autoloading of 3rdparty libraries
CarlSchwan Mar 11, 2022
c7aed50
cs-fix
ArtificialOwl Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switching import to Tools\ 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Mar 11, 2022
commit 2b7dc3a57922fcb2e7a06accad301df8d2f02ff6
2 changes: 1 addition & 1 deletion lib/CirclesManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

namespace OCA\Circles;

use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
use OCA\Circles\Tools\Exceptions\InvalidItemException;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCA\Circles\Exceptions\ContactAddressBookNotFoundException;
use OCA\Circles\Exceptions\ContactFormatException;
Expand Down
4 changes: 2 additions & 2 deletions lib/Collaboration/v2/CollaboratorSearchPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

namespace OCA\Circles\Collaboration\v2;

use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
use OCA\Circles\Tools\Traits\TNCLogger;
use Exception;
use OC\Share20\Share;
use OCA\Circles\AppInfo\Application;
Expand All @@ -51,7 +51,7 @@
* @package OCA\Circles\Collaboration\v2
*/
class CollaboratorSearchPlugin implements ISearchPlugin {
use TNC22Logger;
use TNCLogger;


/** @var IRequest */
Expand Down
20 changes: 10 additions & 10 deletions lib/Command/CirclesCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
use ArtificialOwl\MySmallPhpTools\Model\Request;
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
use Exception;
use OC;
use OC\AppConfig;
Expand All @@ -63,6 +55,14 @@
use OCA\Circles\Service\RemoteService;
use OCA\Circles\Service\RemoteStreamService;
use OCA\Circles\Service\RemoteUpstreamService;
use OCA\Circles\Tools\Exceptions\RequestNetworkException;
use OCA\Circles\Tools\Exceptions\SignatoryException;
use OCA\Circles\Tools\Model\NCRequest;
use OCA\Circles\Tools\Model\Request;
use OCA\Circles\Tools\Model\SimpleDataStore;
use OCA\Circles\Tools\Traits\TArrayTools;
use OCA\Circles\Tools\Traits\TNCRequest;
use OCA\Circles\Tools\Traits\TStringTools;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
Expand All @@ -77,7 +77,7 @@
class CirclesCheck extends Base {
use TStringTools;
use TArrayTools;
use TNC22Request;
use TNCRequest;


public static $checks = [
Expand Down Expand Up @@ -791,7 +791,7 @@ private function testRequest(
string $route,
array $args = []
): bool {
$request = new NC22Request('', Request::type($type));
$request = new NCRequest('', Request::type($type));
$this->configService->configureLoopbackRequest($request, $route, $args);
$request->setFollowLocation(false);

Expand Down
2 changes: 1 addition & 1 deletion lib/Command/CirclesDetails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
use OCA\Circles\Tools\Exceptions\InvalidItemException;
use OC\Core\Command\Base;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCA\Circles\Exceptions\FederatedItemException;
Expand Down
8 changes: 4 additions & 4 deletions lib/Command/CirclesList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
use OCA\Circles\Tools\Exceptions\RequestNetworkException;
use OCA\Circles\Tools\Exceptions\SignatoryException;
use OCA\Circles\Tools\Traits\TArrayTools;
use OCA\Circles\Tools\Traits\TStringTools;
use OC\Core\Command\Base;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCA\Circles\Exceptions\FederatedItemException;
Expand Down
28 changes: 14 additions & 14 deletions lib/Command/CirclesMemberships.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
use ArtificialOwl\MySmallPhpTools\Exceptions\UnknownTypeException;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode;
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use Exception;
use OC\Core\Command\Base;
use OCA\Circles\Db\CircleRequest;
Expand Down Expand Up @@ -66,6 +59,13 @@
use OCA\Circles\Service\ConfigService;
use OCA\Circles\Service\FederatedUserService;
use OCA\Circles\Service\MembershipService;
use OCA\Circles\Tools\Exceptions\InvalidItemException;
use OCA\Circles\Tools\Exceptions\ItemNotFoundException;
use OCA\Circles\Tools\Exceptions\UnknownTypeException;
use OCA\Circles\Tools\Model\SimpleDataStore;
use OCA\Circles\Tools\Model\TreeNode;
use OCA\Circles\Tools\Traits\TArrayTools;
use OCA\Circles\Tools\Traits\TConsoleTree;
use OCP\IUserManager;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
Expand All @@ -81,7 +81,7 @@
*/
class CirclesMemberships extends Base {
use TArrayTools;
use TNC22ConsoleTree;
use TConsoleTree;


/** @var IUserManager */
Expand Down Expand Up @@ -237,7 +237,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$output->writeln('');

$tree = new NC22TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
$tree = new TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
$this->generateTree($federatedUser->getSingleId(), $tree);

$this->drawTree(
Expand All @@ -255,10 +255,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int

/**
* @param string $id
* @param NC22TreeNode $tree
* @param TreeNode $tree
* @param array $knownIds
*/
private function generateTree(string $id, NC22TreeNode $tree, array $knownIds = []) {
private function generateTree(string $id, TreeNode $tree, array $knownIds = []) {
if (in_array($id, $knownIds)) {
return;
}
Expand All @@ -271,11 +271,11 @@ private function generateTree(string $id, NC22TreeNode $tree, array $knownIds =
continue;
}

$item = new NC22TreeNode(
$item = new TreeNode(
$tree, new SimpleDataStore(
[
'member' => $member,
'cycling' => in_array($member->getCircleId(), $knownIds)
'member' => $member,
'cycling' => in_array($member->getCircleId(), $knownIds)
]
)
);
Expand Down
22 changes: 11 additions & 11 deletions lib/Command/CirclesRemote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest;
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown;
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
use OCA\Circles\Tools\Exceptions\RequestNetworkException;
use OCA\Circles\Tools\Exceptions\SignatoryException;
use OCA\Circles\Tools\Exceptions\SignatureException;
use OCA\Circles\Tools\Model\NCRequest;
use OCA\Circles\Tools\Model\NCSignedRequest;
use OCA\Circles\Tools\Traits\TNCWellKnown;
use OCA\Circles\Tools\Traits\TStringTools;
use Exception;
use OC\Core\Command\Base;
use OCA\Circles\AppInfo\Application;
Expand All @@ -63,7 +63,7 @@
* @package OCA\Circles\Command
*/
class CirclesRemote extends Base {
use TNC22WellKnown;
use TNCWellKnown;
use TStringTools;


Expand Down Expand Up @@ -395,12 +395,12 @@ private function updateRemote(RemoteInstance $remoteSignatory): void {
* @param string $remote
* @param array $payload
*
* @return NC22SignedRequest
* @return NCSignedRequest
* @throws RequestNetworkException
* @throws SignatoryException
*/
private function outgoingTest(string $remote, array $payload): NC22SignedRequest {
$request = new NC22Request();
private function outgoingTest(string $remote, array $payload): NCSignedRequest {
$request = new NCRequest();
$request->basedOnUrl($remote);
$request->setFollowLocation(true);
$request->setLocalAddressAllowed(true);
Expand Down
13 changes: 6 additions & 7 deletions lib/Command/CirclesReport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Console\Nextcloud\nc22\NC22InteractiveShell;
use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
use ArtificialOwl\MySmallPhpTools\IInteractiveShellClient;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22InteractiveShellSession;
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use OCA\Circles\Tools\Exceptions\InvalidItemException;
use OCA\Circles\Tools\Traits\TDeserialize;
use OCA\Circles\Tools\Traits\TArrayTools;
use OC\Core\Command\Base;
use OCA\Circles\Exceptions\InitiatorNotFoundException;
use OCA\Circles\Exceptions\UnknownInterfaceException;
Expand All @@ -63,7 +60,7 @@
* @package OCA\Circles\Command
*/
class CirclesReport extends Base implements IInteractiveShellClient {
use TNC22Deserialize;
use TDeserialize;
use TArrayTools;


Expand Down Expand Up @@ -136,6 +133,8 @@ protected function configure() {
* @throws InitiatorNotFoundException
*/
protected function execute(InputInterface $input, OutputInterface $output): int {
throw new \Exception('not available');

$filename = $input->getOption('read');
$local = $input->getOption('local');
$this->output = $output;
Expand Down
12 changes: 6 additions & 6 deletions lib/Command/CirclesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
use OCA\Circles\Tools\Exceptions\InvalidItemException;
use OCA\Circles\Tools\Exceptions\ItemNotFoundException;
use OCA\Circles\Tools\Traits\TDeserialize;
use OCA\Circles\Tools\Traits\TArrayTools;
use OCA\Circles\Tools\Traits\TStringTools;
use Exception;
use OC\Core\Command\Base;
use OCA\Circles\AppInfo\Application;
Expand Down Expand Up @@ -63,7 +63,7 @@
class CirclesTest extends Base {
use TArrayTools;
use TStringTools;
use TNC22Deserialize;
use TDeserialize;


public static $INSTANCES = [
Expand Down
16 changes: 8 additions & 8 deletions lib/Command/MembersAdd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

namespace OCA\Circles\Command;

use ArtificialOwl\MySmallPhpTools\Exceptions\RequestContentException;
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestResultSizeException;
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestServerException;
use ArtificialOwl\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
use ArtificialOwl\MySmallPhpTools\Model\Request;
use OCA\Circles\Tools\Exceptions\RequestContentException;
use OCA\Circles\Tools\Exceptions\RequestNetworkException;
use OCA\Circles\Tools\Exceptions\RequestResultNotJsonException;
use OCA\Circles\Tools\Exceptions\RequestResultSizeException;
use OCA\Circles\Tools\Exceptions\RequestServerException;
use OCA\Circles\Tools\Model\NCRequest;
use OCA\Circles\Tools\Model\Request;
use Exception;
use OC\Core\Command\Base;
use OCA\Circles\Exceptions\FederatedItemException;
Expand Down Expand Up @@ -162,7 +162,7 @@ private function findUserFromLookup(string $search, string &$instance = ''): str
return '';
}

$request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
$request = new NCRequest(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
$this->configService->configureRequest($request);
$request->basedOnUrl($lookup);
$request->addParam('search', $search);
Expand Down
Loading