eee

Base/ActiveQueryInterface.php

@@ -221,10 +221,11 @@ interface ActiveQueryInterface
     public function whereNotBetween(string $column, int|float $start, int|float $end): QueryTrait;
 
     /**
-     * @param array $column
+     * @param array|string $column
+     * @param mixed|null $value
      * @return QueryTrait
      */
-    public function where(array $column): QueryTrait;
+    public function where(array|string $column, mixed $value = null): QueryTrait;
 
 
     /**

Command.php

@@ -160,7 +160,6 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
-            $this->connection->println($this->sql, $this->params);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
             }

Connection.php

@@ -30,6 +30,8 @@ use Kiri\Di\Inject\Container;
 use Swoole\Timer;
 use Database\Base\PDO;
 
+//use PDO;
+
 /**
  * Class Connection
  * @package Database
@@ -122,14 +124,14 @@ class Connection extends Component
      */
     protected function checkClientHealth(Pool $pool): void
     {
-        $pool->flush($this->cds, $this->pool['min'] ?? 1);
-        $length = $pool->size($this->cds);
+        $pool->flush($this->getName(), $this->pool['min'] ?? 1);
+        $length = $pool->size($this->getName());
         for ($i = 0; $i < $length; $i++) {
             try {
                 if (($client = $this->validator($pool)) === false) {
                     break;
                 }
-                $pool->push($this->cds, $client);
+                $pool->push($this->getName(), $client);
             } catch (\Throwable $exception) {
                 if (!str_contains($exception->getMessage(), 'Client timeout.')) {
                     $this->logger->error(throwable($exception), [$this->cds]);
@@ -139,6 +141,15 @@ class Connection extends Component
     }
 
 
+    /**
+     * @return string
+     */
+    private function getName(): string
+    {
+        return 'mysql.' . $this->cds;
+    }
+
+
     /**
      * @param Pool $pool
      * @return PDO|bool
@@ -147,7 +158,7 @@ class Connection extends Component
     protected function validator(Pool $pool): PDO|bool
     {
         /** @var $client PDO */
-        if (($client = $pool->get($this->cds)) === false) {
+        if (($client = $pool->get($this->getName())) === false) {
             return false;
         }
         if ($client->query('select 1') === false) {
@@ -177,7 +188,7 @@ class Connection extends Component
      */
     protected function getNormalClientHealth(): PDO
     {
-        $data = $this->pool()->get($this->cds, $this->waite_time);
+        $data = $this->pool()->get($this->getName(), $this->waite_time);
         if ($data === false) {
             throw new Exception('Client Waite timeout.');
         }
@@ -303,7 +314,7 @@ class Connection extends Component
     public function release(PDO $pdo): void
     {
         if (!$this->inTransaction()) {
-            $this->pool()->push($this->cds, $pdo);
+            $this->pool()->push($this->getName(), $pdo);
         }
     }
 
@@ -315,7 +326,7 @@ class Connection extends Component
      */
     public function clear_connection(): void
     {
-        $this->pool()->flush($this->cds, 0);
+        $this->pool()->flush($this->getName(), 0);
     }
 
 
@@ -327,16 +338,17 @@ class Connection extends Component
         if ($this->timerId > -1) {
             Timer::clear($this->timerId);
         }
-        $this->pool()->close($this->cds);
+        $this->pool()->close($this->getName());
     }
 
 
     /**
      * @return PDO
      */
-    public function newConnect(): PDO
+    public function newConnect(): \PDO
     {
         $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
+//        $pdo = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
             \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
             \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
             \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,
@@ -357,8 +369,8 @@ class Connection extends Component
      */
     protected function pool(): Pool
     {
-        if (!$this->connections->hasChannel($this->cds)) {
-            $this->connections->created($this->cds, $this->pool['max'] ?? 1, [$this, 'newConnect']);
+        if (!$this->connections->hasChannel($this->getName())) {
+            $this->connections->created($this->getName(), $this->pool['max'] ?? 1, [$this, 'newConnect']);
         }
         return $this->connections;
     }

Db.php

@@ -152,6 +152,55 @@ class Db extends QueryTrait implements ISqlBuilder
         return $this->connection->createCommand(SqlBuilder::builder($this)->delete())->delete();
     }
 
+
+    /**
+     * @return bool|array|null
+     */
+    public function first(): bool|array|null
+    {
+        return $this->connection->createCommand(SqlBuilder::builder($this)->one())->one();
+    }
+
+
+    /**
+     * @return bool|array
+     */
+    public function get(): bool|array
+    {
+        return $this->connection->createCommand(SqlBuilder::builder($this)->all())->all();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return mixed
+     */
+    public function exec(string $sql): mixed
+    {
+        return $this->connection->createCommand($sql)->exec();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return array|bool|null
+     */
+    public function query(string $sql): array|bool|null
+    {
+        return $this->connection->createCommand($sql)->one();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return array|bool
+     */
+    public function queryAll(string $sql): array|bool
+    {
+        return $this->connection->createCommand($sql)->all();
+    }
+
+
     /**
      * @param string $table
      * @return array|bool|null

Traits/QueryTrait.php

@@ -27,20 +27,20 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-    public array         $where  = [];
-    public array         $select = ['*'];
-    public array         $join   = [];
-    public array         $order  = [];
-    public int           $offset = -1;
-    public int           $limit  = -1;
-    public string        $group  = '';
-    public string        $from   = '';
-    public string        $alias  = 't1';
+    protected array      $where  = [];
+    protected array      $select = ['*'];
+    protected array      $join   = [];
+    protected array      $order  = [];
+    protected int        $offset = -1;
+    protected int        $limit  = -1;
+    protected string     $group  = '';
+    protected string     $from   = '';
+    protected string     $alias  = 't1';
     protected array      $filter = [];
     protected bool       $lock   = false;
     protected SqlBuilder $builder;
-    public array         $params = [];
-    private array        $_alias = ['t1'];
+    protected array      $params = [];
+    protected array      $_alias = ['t1'];
 
 
     /**
@@ -623,10 +623,14 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array|string $column
+     * @param mixed $value
      * @return $this
      */
-    public function where(array|string $column): static
+    public function where(array|string $column, mixed $value = null): static
     {
+        if (func_num_args() === 2) {
+            return $this->addArray([$column => $value]);
+        }
         if (is_string($column)) {
             return $this->whereRaw($column);
         } else {