Смена пространств имён

This commit is contained in:
RedHood 2021-01-20 12:08:50 +10:00
parent b1f31103eb
commit a4be42cc82
12 changed files with 65 additions and 77 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use Yii; use Yii;
use yii\db\ActiveQueryInterface; use yii\db\ActiveQueryInterface;
@ -104,14 +104,14 @@ class ActiveQuery extends Query implements ActiveQueryInterface
{ {
$statement = $this->createCommand($db); $statement = $this->createCommand($db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::query'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::query'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute(); $cursor = $statement->execute();
$rows = $cursor->getAll(); $rows = $cursor->getAll();
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
if (!empty($rows)) { if (!empty($rows)) {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use Yii; use Yii;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;

View File

@ -1,11 +1,6 @@
<?php <?php
/**
* User: evgen-d
* Date: 08.10.14
* Time: 16:00
*/
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use yii\base\Object; use yii\base\Object;
@ -37,4 +32,3 @@ class AqlExpression extends Object
return $this->expression; return $this->expression;
} }
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use ArangoDBClient\EdgeHandler; use ArangoDBClient\EdgeHandler;
use ArangoDBClient\Export; use ArangoDBClient\Export;
@ -56,16 +56,16 @@ class Connection extends BaseObject
$token = 'Opening ArangoDB connection: ' . $this->connectionOptions[ConnectionOptions::OPTION_ENDPOINT]; $token = 'Opening ArangoDB connection: ' . $this->connectionOptions[ConnectionOptions::OPTION_ENDPOINT];
try { try {
Yii::info($token, 'explosivebit\arangodb\Connection::open'); Yii::info($token, 'mirzaev\yii2\arangodb\Connection::open');
Yii::beginProfile($token, 'explosivebit\arangodb\Connection::open'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
$this->connection = new \ArangoDBClient\Connection($this->connectionOptions); $this->connection = new \ArangoDBClient\Connection($this->connectionOptions);
$this->collectionHandler = new CollectionHandler($this->connection); $this->collectionHandler = new CollectionHandler($this->connection);
$this->documentHandler = new DocumentHandler($this->connection); $this->documentHandler = new DocumentHandler($this->connection);
$this->edgeHandler = new EdgeHandler($this->connection); $this->edgeHandler = new EdgeHandler($this->connection);
$this->graphHandler = new GraphHandler($this->connection); $this->graphHandler = new GraphHandler($this->connection);
Yii::endProfile($token, 'explosivebit\arangodb\Connection::open'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Connection::open'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Connection::open');
throw new \Exception($ex->getMessage(), (int)$ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int)$ex->getCode(), $ex);
} }
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
class Exception extends \yii\base\Exception class Exception extends \yii\base\Exception
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use yii\base\Component; use yii\base\Component;
use yii\db\MigrationInterface; use yii\db\MigrationInterface;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use Yii; use Yii;
use ArangoDBClient\Document; use ArangoDBClient\Document;
@ -131,13 +131,13 @@ class Query extends Component implements QueryInterface
$options = ArrayHelper::merge($params, $options); $options = ArrayHelper::merge($params, $options);
$statement = $this->getStatement($options); $statement = $this->getStatement($options);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::query'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::query'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
return $this->prepareResult($cursor->getAll()); return $this->prepareResult($cursor->getAll());
@ -619,13 +619,13 @@ class Query extends Component implements QueryInterface
{ {
$statement = $this->createCommand($db); $statement = $this->createCommand($db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::query'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::query'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
return $this->prepareResult($cursor->getAll()); return $this->prepareResult($cursor->getAll());
@ -641,13 +641,13 @@ class Query extends Component implements QueryInterface
$this->limit(1); $this->limit(1);
$statement = $this->createCommand($db); $statement = $this->createCommand($db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::query'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::query'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
$result = $this->prepareResult($cursor->getAll()); $result = $this->prepareResult($cursor->getAll());
@ -682,13 +682,13 @@ class Query extends Component implements QueryInterface
$statement = $this->getStatement($params, $db); $statement = $this->getStatement($params, $db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::insert'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::insert');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::insert'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::insert'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::insert'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::insert');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
return true; return true;
@ -725,13 +725,13 @@ class Query extends Component implements QueryInterface
$statement = $this->getStatement($params, $db); $statement = $this->getStatement($params, $db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::update'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::update');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::update'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::update');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::update'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::update');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::update'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::update');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
$meta = $cursor->getMetadata(); $meta = $cursor->getMetadata();
@ -770,13 +770,13 @@ class Query extends Component implements QueryInterface
$statement = $this->getStatement($params, $db); $statement = $this->getStatement($params, $db);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::remove'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::remove');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::remove'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::remove'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::remove'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::remove');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
$meta = $cursor->getMetadata(); $meta = $cursor->getMetadata();
@ -859,13 +859,13 @@ class Query extends Component implements QueryInterface
$statement->setBatchSize(1); $statement->setBatchSize(1);
$token = $this->getRawAql($statement); $token = $this->getRawAql($statement);
Yii::info($token, 'explosivebit\arangodb\Query::query'); Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try { try {
Yii::beginProfile($token, 'explosivebit\arangodb\Query::query'); Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute(); $cursor = $statement->execute();
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
} catch (\Exception $ex) { } catch (\Exception $ex) {
Yii::endProfile($token, 'explosivebit\arangodb\Query::query'); Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex); throw new \Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
} }
return $cursor->getFullCount(); return $cursor->getFullCount();
@ -1237,6 +1237,6 @@ class Query extends Component implements QueryInterface
} }
return $this; return $this;
} }
public function emulateExecution ( $value = true ){} public function emulateExecution ( $value = true ){}
} }

View File

@ -1,11 +1,6 @@
<?php <?php
/**
* User: evgen-d
* Date: 08.10.14
* Time: 16:04
*/
namespace explosivebit\arangodb; namespace mirzaev\yii2\arangodb;
use yii\base\Arrayable; use yii\base\Arrayable;
@ -56,4 +51,3 @@ class Serializer
return $data; return $data;
} }
} }

View File

@ -1,11 +1,11 @@
<?php <?php
namespace explosivebit\arangodb\console\controllers; namespace mirzaev\yii2\arangodb\console\controllers;
use explosivebit\arangodb\Connection; use mirzaev\yii2\arangodb\Connection;
use explosivebit\arangodb\Exception; use mirzaev\yii2\arangodb\Exception;
use explosivebit\arangodb\Migration; use mirzaev\yii2\arangodb\Migration;
use explosivebit\arangodb\Query; use mirzaev\yii2\arangodb\Query;
use yii; use yii;
use yii\console\controllers\BaseMigrateController; use yii\console\controllers\BaseMigrateController;

View File

@ -1,8 +1,8 @@
<?php <?php
namespace explosivebit\arangodb\panels\arangodb; namespace mirzaev\yii2\arangodb\panels\arangodb;
use explosivebit\arangodb\panels\arangodb\models\ArangoDb; use mirzaev\yii2\arangodb\panels\arangodb\models\ArangoDb;
use Yii; use Yii;
use yii\debug\Panel; use yii\debug\Panel;
use yii\log\Logger; use yii\log\Logger;
@ -31,11 +31,11 @@ class ArangoDbPanel extends Panel
$target->messages, $target->messages,
Logger::LEVEL_PROFILE, Logger::LEVEL_PROFILE,
[ [
'explosivebit\arangodb\Query::query', 'mirzaev\yii2\arangodb\Query::query',
'explosivebit\arangodb\Query::insert', 'mirzaev\yii2\arangodb\Query::insert',
'explosivebit\arangodb\Query::update', 'mirzaev\yii2\arangodb\Query::update',
'explosivebit\arangodb\Query::remove', 'mirzaev\yii2\arangodb\Query::remove',
'explosivebit\arangodb\Query::execute', 'mirzaev\yii2\arangodb\Query::execute',
] ]
); );
} }
@ -136,15 +136,15 @@ class ArangoDbPanel extends Panel
protected function getQueryType($category) { protected function getQueryType($category) {
switch ($category) { switch ($category) {
case 'explosivebit\arangodb\Query::query' : case 'mirzaev\yii2\arangodb\Query::query' :
return 'SELECT'; return 'SELECT';
case 'explosivebit\arangodb\Query::insert' : case 'mirzaev\yii2\arangodb\Query::insert' :
return 'INSERT'; return 'INSERT';
case 'explosivebit\arangodb\Query::update' : case 'mirzaev\yii2\arangodb\Query::update' :
return 'UPDATE'; return 'UPDATE';
case 'explosivebit\arangodb\Query::remove' : case 'mirzaev\yii2\arangodb\Query::remove' :
return 'REMOVE'; return 'REMOVE';
case 'explosivebit\arangodb\Query::execute' : case 'mirzaev\yii2\arangodb\Query::execute' :
return 'EXECUTE'; return 'EXECUTE';
default : default :
return ''; return '';
@ -155,4 +155,4 @@ class ArangoDbPanel extends Panel
{ {
return ['arango-messages' => $this->getProfileLogs()]; return ['arango-messages' => $this->getProfileLogs()];
} }
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace explosivebit\arangodb\panels\arangodb\models; namespace mirzaev\yii2\arangodb\panels\arangodb\models;
use yii; use yii;
use yii\data\ArrayDataProvider; use yii\data\ArrayDataProvider;

View File

@ -8,7 +8,7 @@
echo "<?php\n"; echo "<?php\n";
?> ?>
class <?= $className ?> extends \explosivebit\arangodb\Migration class <?= $className ?> extends \mirzaev\yii2\arangodb\Migration
{ {
public function up() public function up()
{ {