create

mathsgod · Oct 14, 2022 · a0f0c4d · a0f0c4d
1 parent 6342ecf
commit a0f0c4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -48,18 +48,7 @@ static function SetSchema(Schema $schema)
     static function GetSchema()
     {
         if (self::$_schema == null) {
-
-            //load from .env
-            $dotenv = \Dotenv\Dotenv::createImmutable(getcwd());
-            $dotenv->load();
-
-            $host = $_ENV["DATABASE_HOSTNAME"];
-            $name = $_ENV["DATABASE_DATABASE"];
-            $port = $_ENV["DATABASE_PORT"] ?? 3306;
-            $username = $_ENV["DATABASE_USERNAME"];
-            $password = $_ENV["DATABASE_PASSWORD"];
-            $charset = $_ENV["DATABASE_CHARSET"] ?? "utf8mb4";
-            self::$_schema = new Schema($name, $host, $username, $password, $charset, $port);
+            self::$_schema = Schema::Create();
         }
         return self::$_schema;
     }

diff --git a/src/Schema.php b/src/Schema.php
@@ -60,6 +60,21 @@ public function __construct(string $database, string $hostname, string $username
         ]);
     }
 
+    static function Create()
+    {
+        //load from .env
+        $dotenv = \Dotenv\Dotenv::createImmutable(getcwd());
+        $dotenv->load();
+
+        $host = $_ENV["DATABASE_HOSTNAME"];
+        $name = $_ENV["DATABASE_DATABASE"];
+        $port = $_ENV["DATABASE_PORT"] ?? 3306;
+        $username = $_ENV["DATABASE_USERNAME"];
+        $password = $_ENV["DATABASE_PASSWORD"];
+        $charset = $_ENV["DATABASE_CHARSET"] ?? "utf8mb4";
+        return new Schema($name, $host, $username, $password, $charset, $port);
+    }
+
     function beginTransaction(): bool
     {
         $this->in_transaction = true;