update. some bug fixed for redis, db client

Author: inhere

examples/db.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-11-03
+ * Time: 10:11
+ */
+
+
+use Inhere\Library\Components\DatabaseClient;
+
+require __DIR__ . '/s-autoload.php';
+
+$db = DatabaseClient::make([
+    'user' => 'root',
+    'password' => 'root',
+]);
+
+$db->on(DatabaseClient::CONNECT, function ($db) {
+    echo "connect database success\n";
+});
+$db->on(DatabaseClient::DISCONNECT, function ($db) {
+    echo "disconnect database success\n";
+});
+
+$ret = $db->fetchAll('show tables');
+
+dump_vars($ret);

examples/pro_logger.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-11-03
+ * Time: 10:11
+ */
+
+
+use Inhere\Library\Components\RedisClient;
+
+require __DIR__ . '/s-autoload.php';
+
+$redis = new RedisClient([
+
+]);
+
+$redis->on(RedisClient::CONNECT, function ($r) {
+    echo "connect redis success\n";
+});
+$redis->on(RedisClient::DISCONNECT, function ($r) {
+    echo "disconnect redis success\n";
+});
+
+$suc = $redis->set('key1', 'value');
+$ret = $redis->get('key1');
+
+dump_vars($suc, $ret);
+
+$ret = $redis->getStats('STATS');
+
+dump_vars($ret);

examples/redis.php

@@ -8,6 +8,7 @@
 
 namespace Inhere\Library\Components;
 
+use Inhere\Exceptions\UnknownMethodException;
 use Inhere\Library\Helpers\DsnHelper;
 use Inhere\Library\Traits\LiteConfigTrait;
 use Inhere\Library\Traits\LiteEventTrait;
@@ -48,6 +49,18 @@ class DatabaseClient
     /** @var string */
     protected $prefixPlaceholder = '{@pfx}';
 
+    /** @var string */
+    protected $quoteNamePrefix = '"';
+
+    /** @var string */
+    protected $quoteNameSuffix = '"';
+
+    /** @var string */
+    protected $quoteNameEscapeChar = '"';
+
+    /** @var string */
+    protected $quoteNameEscapeReplace = '""';
+
     /**
      * All of the queries run against the connection.
      * @var array
@@ -80,6 +93,7 @@ class DatabaseClient
 
         'tablePrefix' => '',
 
+        'debug' => false,
         // retry times.
         'retry' => 0,
     ];
@@ -97,13 +111,39 @@ class DatabaseClient
         PDO::ATTR_EMULATE_PREPARES => false,
     ];
 
+    /**
+     * @param array $config
+     * @return static
+     */
+    public static function make(array $config = [])
+    {
+        return new static($config);
+    }
+
     /**
      * @param array $config
      */
     public function __construct(array $config = [])
     {
+        if (!class_exists(\PDO::class, false)) {
+            throw new \RuntimeException("The php extension 'redis' is required.");
+        }
+
         $this->setConfig($config);
 
+        // init something...
+        $this->debug = (bool)$this->config['debug'];
+        $this->tablePrefix = $this->config['tablePrefix'];
+        $this->databaseName = $this->config['database'];
+
+        $retry = (int) $this->config['retry'];
+        $this->config['retry'] = ($retry > 0 && $retry <= 5) ? $retry : 0;
+        $this->config['options'] = static::$pdoOptions + $this->config['options'];
+
+        if (!self::isSupported($this->config['driver'])) {
+            throw new \RuntimeException("The system is not support driver: {$this->config['driver']}");
+        }
+
         $this->initQuoteNameChar($this->config['driver']);
     }
 
@@ -116,18 +156,14 @@ public function connect()
             return $this;
         }
 
-        $this->config['options'] = array_merge($this->config['options'], static::$pdoOptions);
-
         $config = $this->config;
         $retry = (int) $config['retry'];
         $retry = ($retry > 0 && $retry <= 5) ? $retry : 0;
-        $options = is_array($config['options']) ? $config['options'] : [];
         $dsn = DsnHelper::getDsn($config);
 
         do {
             try {
-                $pdo = new PDO($dsn, $config['user'], $config['password'], $options);
-
+                $this->pdo = new PDO($dsn, $config['user'], $config['password'], $config['options']);
                 break;
             } catch (\PDOException $e) {
                 if ($retry <= 0) {
@@ -139,7 +175,6 @@ public function connect()
             usleep(50000);
         } while ($retry >= 0);
 
-        $this->pdo = $pdo;
         $this->log('connect to DB server', ['config' => $config], 'connect');
         $this->fire(self::CONNECT, [$this]);
 
@@ -154,10 +189,10 @@ public function reconnect()
 
     /**
      * disconnect
-     * @return bool
      */
     public function disconnect()
     {
+        $this->fire(self::DISCONNECT, [$this]);
         $this->pdo = null;
     }
 
@@ -224,27 +259,27 @@ public function __call($name, array $arguments)
     /**
      * Run a select statement, fetch one
      * @param  string $from
-     * @param  array|string $wheres
+     * @param  array|string|int $wheres
      * @param  string|array $select
      * @param  array $options
      * @return array
      */
     public function find(string $from, $wheres = 1, $select = '*', array $options = [])
     {
-        
+        return [];
     }
 
     /**
      * Run a select statement, fetch all
      * @param  string $from
-     * @param  array|string $wheres
+     * @param  array|string|int $wheres
      * @param  string|array $select
      * @param  array $options
      * @return array
      */
     public function findAll(string $from, $wheres = 1, $select = '*', array $options = [])
     {
-        # code...
+        return [];
     }
 
     /**
@@ -319,11 +354,13 @@ public function count(string $table, $wheres)
      * $db->exists();
      * // SQL: select exists(select * from `table` where (`phone` = 152xxx)) as `exists`;
      * ```
+     * @param $statement
+     * @param array $bindings
      * @return int
      */
     public function exists($statement, array $bindings = [])
     {
-        $sql = sprintf('SELECT EXISTS(%s) AS `exists`', $sql);
+        $sql = sprintf('SELECT EXISTS(%s) AS `exists`', $statement);
 
         $result = $this->fetchObject($sql, $bindings);
 
@@ -747,8 +784,6 @@ public function ping()
     /**
      * handle where condition
      * @param array|string|\Closure $wheres
-     * @param RecordModel|string $model the model class name, is a string
-     * @param Query $query
      * @example
      * ```
      * ...
@@ -1066,6 +1101,16 @@ public static function getAvailableDrivers()
         return PDO::getAvailableDrivers();
     }
 
+    /**
+     * Is this driver supported.
+     * @param string $driver
+     * @return bool
+     */
+    public static function isSupported(string $driver)
+    {
+        return in_array($driver, \PDO::getAvailableDrivers(), true);
+    }
+
     /**
      * @param PDOStatement $sth
      * @return $this
@@ -1079,6 +1124,19 @@ public function freeResource($sth = null)
         return $this;
     }
 
+    /**************************************************************************
+     * getter/setter methods
+     *************************************************************************/
+
+    /**
+     * Get the name of the driver.
+     * @return string
+     */
+    public function getDriverName()
+    {
+        return $this->config['driver'];
+    }
+
     /**
      * Get the name of the connected database.
      * @return string
@@ -1172,4 +1230,5 @@ public function isConnected(): bool
     {
         return (bool) $this->pdo;
     }
+
 }