ModelTrait

Author: Ethan

src/Builder.php

@@ -18,9 +18,10 @@
  */
 class Builder
 {
-    /**
-     * @var Connection 数据库连接对象
-     */
+    /** @var static */
+    protected static $instance;
+
+    /** @var Connection 数据库连接对象 */
     private $db;
 
     protected $table;
@@ -41,7 +42,6 @@ class Builder
     protected $groupBy;
     protected $having;
 
-
     /**
      * 自动生成查询绑定参数前缀
      */
@@ -57,6 +57,23 @@ public function __construct(array $config = array())
         }
     }
 
+    /**
+     * @return static
+     */
+    public function setAsGlobal()
+    {
+        static::$instance = $this;
+        return $this;
+    }
+
+    /**
+     * @return static
+     */
+    public static function getInstance()
+    {
+        return static::$instance;
+    }
+
     /**
      * 设置数据库连接
      *

src/ModelTrait.php

@@ -5,7 +5,7 @@
 use PFinal\Database\Relations\BelongsTo;
 use PFinal\Database\Relations\HasMany;
 use PFinal\Database\Relations\HasOne;
-use Leaf\DB;
+use PFinal\Database\Builder as DB;
 use PFinal\Database\Relations\RelationBase;
 
 /**
@@ -47,22 +47,22 @@ trait ModelTrait
      */
     public static function tableName()
     {
-        return '{{%' . self::getTableName(get_called_class()) . '}}';
+        return '{{%' . self::convertTableName(get_called_class()) . '}}';
     }
 
     public static function __callStatic($name, $arguments)
     {
         return call_user_func_array(
-            [DB::table(static::tableName(), self::getTableName(get_called_class()))->asEntity(static::className()), $name],
+            [DB::getInstance()->table(static::tableName(), self::convertTableName(get_called_class()))->asEntity(get_called_class()), $name],
             $arguments);
     }
 
     public function loadDefaultValues()
     {
-        return DB::table(static::tableName())->loadDefaultValues($this);
+        return DB::getInstance()->table(static::tableName())->loadDefaultValues($this);
     }
 
-    private static function getTableName($className)
+    private static function convertTableName($className)
     {
         //去掉namespace
         $name = rtrim(str_replace('\\', '/', $className), '/\\');
@@ -87,11 +87,11 @@ private static function getTableName($className)
     public function hasOne($related, $foreignKey = null, $localKey = 'id')
     {
         if ($foreignKey === null) {
-            $foreignKey = self::getTableName(get_called_class()) . '_id';
+            $foreignKey = self::convertTableName(get_called_class()) . '_id';
         }
 
         $hasOne = new HasOne();
-        $hasOne->setConnection(DB::getConnection());
+        $hasOne->setConnection(DB::getInstance()->getConnection());
 
         $obj = $hasOne->table($related::tableName())->asEntity($related);
 
@@ -113,11 +113,11 @@ public function hasOne($related, $foreignKey = null, $localKey = 'id')
     public function belongsTo($related, $foreignKey = null, $ownerKey = 'id')
     {
         if ($foreignKey === null) {
-            $foreignKey = self::getTableName($related) . '_id';
+            $foreignKey = self::convertTableName($related) . '_id';
         }
 
         $hasOne = new BelongsTo();
-        $hasOne->setConnection(DB::getConnection());
+        $hasOne->setConnection(DB::getInstance()->getConnection());
 
         $obj = $hasOne->table($related::tableName())->asEntity($related);
 
@@ -139,11 +139,11 @@ public function belongsTo($related, $foreignKey = null, $ownerKey = 'id')
     public function hasMany($related, $foreignKey = null, $localKey = 'id')
     {
         if ($foreignKey === null) {
-            $foreignKey = self::getTableName(get_called_class()) . '_id';
+            $foreignKey = self::convertTableName(get_called_class()) . '_id';
         }
 
         $hasOne = new HasMany();
-        $hasOne->setConnection(DB::getConnection());
+        $hasOne->setConnection(DB::getInstance()->getConnection());
 
         $obj = $hasOne->table($related::tableName())->asEntity($related);
 
@@ -167,7 +167,7 @@ public static function with($relations)
     {
         $relations = is_string($relations) ? func_get_args() : $relations;
 
-        return DB::table(static::tableName(), self::getTableName(get_called_class()))->asEntity(static::className())->afterFind(function ($models) use ($relations) {
+        return DB::getInstance()->table(static::tableName(), self::convertTableName(get_called_class()))->asEntity(get_called_class())->afterFind(function ($models) use ($relations) {
             RelationBase::appendRelationData($models, $relations);
         });
     }