1.优化部分数据操作

xcg340122 · Sep 18, 2018 · 119c101 · 119c101
1 parent 110abb4
commit 119c101
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/Framework/Library/Process/Drive/Db/Mysqli.php b/Framework/Library/Process/Drive/Db/Mysqli.php
@@ -73,6 +73,12 @@ class Mysqli implements DbInterfaces
      */
     protected $database = '';
 
+    /**
+     * 表前缀
+     * @var string
+     */
+    protected $tabprefix = '';
+
     /**
      * 获取错误信息
      * @return string
@@ -96,6 +102,9 @@ public function connect($config = [])
         if ($this->link != null) {
             $this->database = $config['database'];
             mysqli_query($this->link, 'set names ' . $config['char']);
+            if(!empty($config['tabprefix'])){
+                $this->tabprefix = $config['tabprefix'];
+            }
             return $this->link;
         } else {
             \Framework\App::$app->get('LogicExceptions')->readErrorFile([
@@ -108,6 +117,7 @@ public function connect($config = [])
     /**
      * 操作多数据库连接
      * @param $link
+     * @return $this
      */
     public function setlink($link)
     {
@@ -148,7 +158,7 @@ public function find()
 
     /**
      * debug
-     * @return array
+     * @return bool|mixed
      */
     public function debug()
     {
@@ -172,7 +182,7 @@ public function total()
     public function table($tabName = '')
     {
         if (!empty($tabName)) {
-            $this->tableName = '`' . $tabName . '`';
+            $this->tableName = '`' . $this->tabprefix . $tabName . '`';
             $this->getTableInfo();
             return $this;
         } else {
@@ -231,10 +241,7 @@ public function select($qryArray = [])
         if (empty($field)) $field = ' * ';
 
         if (isset($qryArray['join'])) {
-            $join .= ' ' . is_array($qryArray['join']) ? implode(' ', $qryArray['join']) : $qryArray['join'];
-            if (empty($join)) {
-                $join = ' ' . $join;
-            }
+            $join = is_array($qryArray['join']) ? ' '.implode(' ', $qryArray['join']) : ' '.$qryArray['join'];
         }
         if (isset($qryArray['where'])) {
             $where = $this->structureWhere($qryArray['where']);

diff --git a/Framework/Library/Process/Drive/Db/PDO.php b/Framework/Library/Process/Drive/Db/PDO.php
@@ -16,38 +16,43 @@ class Pdo implements DbInterfaces
      * @var string
      */
     public $dbErrorMsg = 'SQL IN WRONG: ';
+
     /**
      * 获取方式
      * @var int
      */
     public $fetchMethod = \PDO::FETCH_OBJ;
+
     /**
      * 实例对象
      * @var
      */
     protected $pdo;
+
     /**
      * 结果集
      * @var bool
      */
     protected $result = false;
+
     /**
      * 影响条数
      * @var
      */
     protected $total;
+
     /**
      * 操作表名
      * @var null
      */
     protected $tableName = NULL;
+
     /**
      * debug
      * @var array
      */
     protected $queryDebug = [];
 
-
     /**
      * 数据主键
      * @var string
@@ -72,6 +77,12 @@ class Pdo implements DbInterfaces
      */
     protected $database = '';
 
+    /**
+     * 表前缀
+     * @var string
+     */
+    protected $tabprefix = '';
+
     /**
      * 获取异常信息
      * @return mixed
@@ -101,6 +112,9 @@ public function connect($config = [])
 
             $this->pdo = new \PDO($dsn, $config['username'], $config['password'], $opt);
             $this->database = $config['database'];
+            if(!empty($config['tabprefix'])){
+                $this->tabprefix = $config['tabprefix'];
+            }
             return $this->pdo;
         } catch (\PDOException $ex) {
             exit($this->dbErrorMsg . $ex->getMessage());
@@ -252,7 +266,7 @@ private function handleres($sql, $iserror = false, $ex = [])
     public function table($tableName = '')
     {
         if (!empty($tableName)) {
-            $this->tableName = '`' . $tableName . '`';
+            $this->tableName = '`' . $this->tabprefix . $tableName . '`';
             $this->getTableInfo();
             return $this;
         } else {
@@ -318,10 +332,7 @@ public function select($qryArray = [])
         if (empty($field)) $field = ' * ';
 
         if (isset($qryArray['join'])) {
-            $join .= is_array($qryArray['join']) ? implode(' ', $qryArray['join']) : $qryArray['join'];
-            if (empty($join)) {
-                $join = ' ' . $join;
-            }
+            $join = is_array($qryArray['join']) ? ' '.implode(' ', $qryArray['join']) : ' '.$qryArray['join'];
         }
         if (isset($qryArray['where'])) {
             $where = $this->structureWhere($qryArray['where']);

diff --git a/Framework/frame.php b/Framework/frame.php
@@ -120,6 +120,7 @@ public function run()
         if (Running::$runMode == 'cli') Visit::setCliParam();
         $object = Visit::mergeParam();
         $function = Visit::getfunction();
+        Running::setconstant();
         $app = new $object();
         if (method_exists($app, $function)) {
             $this->get('ReturnHandle')->Output($app->$function());

diff --git a/Project/Common/Config/Db.cfg.php b/Project/Common/Config/Db.cfg.php
@@ -25,6 +25,9 @@
         /** 数据库名称 */
         'database' => 'test',
 
+        /** 数据表前缀 */
+        'tabprefix' => '',
+
         /** 数据库编码 */
         'char' => 'utf8',
 

diff --git a/Project/Model/UserModel.class.php b/Project/Model/UserModel.class.php
@@ -4,8 +4,8 @@
 
 /**
  * 数据模型类演示
- * Class IndexModel
- * @package Model\Home
+ * Class UserModel
+ * @package App\Model
  */
 class UserModel
 {