调整：数据应用存取方式

dxkite · May 14, 2019 · 0681991 · 0681991
1 parent afac5a4
commit 0681991
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 67 deletions.
diff --git a/suda/src/application/Application.php b/suda/src/application/Application.php
@@ -1,26 +1,23 @@
 <?php
 namespace suda\application;
 
-use function array_key_exists;
-use function constant;
 use Exception;
-use ReflectionException;
-use suda\application\exception\ConfigurationException;
-use suda\application\template\ModuleTemplate;
-use suda\orm\exception\SQLException;
 use Throwable;
+use ReflectionException;
 use suda\framework\Request;
 use suda\framework\Response;
-use suda\application\database\Table;
+use suda\orm\exception\SQLException;
 use suda\framework\route\MatchResult;
-use suda\application\database\DataAccess;
+use suda\application\database\Database;
 use suda\application\loader\ModuleLoader;
 use suda\application\template\RawTemplate;
 use suda\application\loader\LanguageLoader;
+use suda\application\template\ModuleTemplate;
 use suda\application\wrapper\TemplateWrapper;
 use suda\application\loader\ApplicationLoader;
 use suda\application\processor\FileRequestProcessor;
 use suda\application\wrapper\ExceptionContentWrapper;
+use suda\application\exception\ConfigurationException;
 use suda\application\processor\TemplateAssetProccesser;
 use suda\application\processor\TemplateRequestProcessor;
 
@@ -48,8 +45,7 @@ public function load()
         $this->debug->time('loading data-source');
         $appLoader->loadDataSource();
         $this->debug->timeEnd('loading data-source');
-        Table::load($this);
-        DataAccess::loadApplication($this);
+        Database::loadApplication($this);
         $this->event->exec('application:load-environment', [ $this->config ,$this]);
         $this->debug->time('loading route');
         $appLoader->loadRoute();

diff --git a/suda/src/application/database/DataAccess.php b/suda/src/application/database/DataAccess.php
@@ -14,12 +14,6 @@
 class DataAccess extends \suda\orm\DataAccess
 {
 
-    /**
-     * 应用引用
-     *
-     * @var Application
-     */
-    protected static $application;
 
     /**
      * 创建对数据的操作
@@ -30,7 +24,7 @@ class DataAccess extends \suda\orm\DataAccess
      */
     public function __construct(string $object, ?Middleware $middleware = null)
     {
-        parent::__construct($object, static::$application->getDataSource(), $middleware);
+        parent::__construct($object, Database::application()->getDataSource(), $middleware);
     }
 
     /**
@@ -61,25 +55,4 @@ public static function new(string $object, ?Middleware $middleware = null):DataA
     {
         return new self($object, $middleware);
     }
-
-    /**
-     * 从应用创建表
-     *
-     * @param Application $application
-     * @return void
-     */
-    public static function loadApplication(Application $application)
-    {
-        static::$application = $application;
-    }
-
-    /**
-     * Get 应用引用
-     *
-     * @return  Application
-     */
-    public static function application()
-    {
-        return static::$application;
-    }
 }
diff --git a/suda/src/application/database/Database.php b/suda/src/application/database/Database.php
@@ -0,0 +1,38 @@
+<?php
+
+
+namespace suda\application\database;
+
+
+use suda\application\Application;
+
+class Database
+{
+    /**
+     * 应用引用
+     *
+     * @var Application
+     */
+    protected static $application;
+
+    /**
+     * 从应用创建表
+     *
+     * @param Application $application
+     * @return void
+     */
+    public static function loadApplication(Application $application)
+    {
+        static::$application = $application;
+    }
+
+    /**
+     * Get 应用引用
+     *
+     * @return  Application
+     */
+    public static function application()
+    {
+        return static::$application;
+    }
+}
diff --git a/suda/src/application/database/QueryAccess.php b/suda/src/application/database/QueryAccess.php
@@ -0,0 +1,17 @@
+<?php
+
+
+namespace suda\application\database;
+
+
+use suda\application\Application;
+use suda\orm\DataSource;
+use suda\orm\middleware\Middleware;
+
+class QueryAccess extends \suda\orm\statement\QueryAccess
+{
+    public function __construct(Middleware $middleware = null)
+    {
+        parent::__construct(Database::application()->getDataSource(), $middleware);
+    }
+}
diff --git a/suda/src/application/database/Table.php b/suda/src/application/database/Table.php
@@ -16,27 +16,9 @@ abstract class Table extends TableAccess implements Middleware
 {
     use TableMiddlewareTrait;
 
-    /**
-     * 应用引用
-     *
-     * @var Application
-     */
-    protected static $application;
-
-    /**
-     * 从应用创建表
-     *
-     * @param Application $application
-     * @return void
-     */
-    public static function load(Application $application)
-    {
-        static::$application = $application;
-    }
-
     public function __construct(string $tableName)
     {
-        parent::__construct($this->initStruct($tableName), static::$application->getDataSource(), $this);
+        parent::__construct($this->initStruct($tableName), Database::application()->getDataSource(), $this);
     }
 
     abstract public function onCreateStruct(TableStruct $table):TableStruct;
@@ -52,14 +34,4 @@ protected function initStruct(string $tableName):TableStruct
         $table = new TableStruct($tableName);
         return $this->onCreateStruct($table);
     }
-
-    /**
-     * Get 应用引用
-     *
-     * @return  Application
-     */
-    public static function application()
-    {
-        return static::$application;
-    }
 }