Migration Upgrades

Fredrick Peter · Fredrick Peter · commit b64429f178e6 · 2023-05-22T19:21:18.000+01:00
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/php-orm-database": "^4.1.3"
+    "peterson/php-orm-database": "^4.1.4"
 }
 ```
 
@@ -1113,6 +1113,8 @@ Migration::create('users_wallet');
 Migration::create('tb_jobs', 'jobs');
 Migration::create('tb_sessions', 'sessions'); 
 
+or
+migration()->create('users');
 
 Table `2023_04_19_1681860618_user` has been created successfully
 Table `2023_04_19_1681860618_user_wallet` has been created successfully
@@ -1129,6 +1131,8 @@ Table `2023_04_19_1681860618_tb_sessions` has been created successfully
 ```
 Migration::run('up');
 
+or
+migration()->run('up');
 
 Migration runned successfully on `2023_04_19_1681860618_user` 
 Migration runned successfully on `2023_04_19_1681860618_user_wallet` 
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.1.3-dev"
+            "dev-main": "4.1.4-dev"
         }
     },
     "minimum-stability": "stable",
diff --git a/src/DB.php b/src/DB.php
@@ -35,6 +35,5 @@ public function __construct(?array $options = []) {
                 $this->configurePagination($options);
             }
         }
-        
     }
 }
diff --git a/src/Dummy/dummyMigration.php b/src/Dummy/dummyMigration.php
@@ -27,7 +27,7 @@ public function up()
      */
     public function drop()
     {
-        Schema::dropTable('dummy_table');
+        return Schema::dropTable('dummy_table');
     }
 
     /**
@@ -38,7 +38,7 @@ public function drop()
      */
     public function column(?string $column)
     {
-        Schema::dropColumn('dummy_table', $column);
+        return Schema::dropColumn('dummy_table', $column);
     }
 
 };
diff --git a/src/Migrations/Blueprint.php b/src/Migrations/Blueprint.php
@@ -30,55 +30,93 @@ class Blueprint extends Constants{
      */
     public function __construct(?string $tableName = null) 
     {
-        $this->db = new DB();
-        $this->tableName = $tableName;
-        $this->charSet   = $_ENV['DB_CHARSET'] ?? '';
-        $this->collation = $_ENV['DB_COLLATION'] ?? '';
+        $this->db           = new DB();
+        $this->tableName    = $tableName;
+        $this->charSet      = $_ENV['DB_CHARSET'] ?? '';
+        $this->collation    = $_ENV['DB_COLLATION'] ?? '';
+    }
+
+    /**
+     * Creating Session Query
+     * - To hold each Migration Request
+     * @param mixed $query
+     * 
+     * @return void
+     */
+    private function tempMigrationQuery(mixed $query = null)
+    {
+        // Start the session has not already been started
+        if (session_status() == PHP_SESSION_NONE) {
+            session_start();
+        }
+
+        $_SESSION[$this->session] = json_encode($query);
     }
 
     /**
      * Creating Table Structure
      * Indexs|Primary|Constraints 
      * 
-     * @return string\MySQLTemplate
+     * @return array\MySQLTemplate
      */
     private function MySQLTemplate()
     {
         $checkPrimary = array_column($this->columns, 'primary');
         if(count($checkPrimary) > 1){
-            throw new \Exception('Primary Key can not be more than one in a table');
+            return [
+                'response'  => self::ERROR_404,
+                'message'   => sprintf("Primary Key can not be more than one in `%s` @table", $this->tableName),
+            ];
         }
-
-        return $this->toMySQLQuery();
+        
+        return [
+            'response'  => self::ERROR_200,
+            'message'   => $this->toMySQLQuery()
+        ];
     }
 
     /**
      * Creating Database Table
      * 
      * @return array\handle
      */
-    private function handle() 
+    public function handle() 
     {
+        // create traceable table
+        $traceTable = $this->traceable($this->tableName);
+
+        // handle error
+        $handle = self::checkDBConnect($traceTable);
+        if(is_array($handle)){
+            return $handle;
+        } 
+
+        // primary key error
+        $mysqlHandle = $this->MySQLTemplate();
+        if($mysqlHandle['response'] != self::ERROR_200){
+            return $mysqlHandle;
+        } 
+
         // Handle query
         try{
             // check if table already exist
             if($this->db->tableExist($this->tableName)){
-                $message = "Migration runned 
-                <span style='background: #ee0707; {$this->style}'>
-                Failed
-                </span> Table already exist on `{$this->traceable($this->tableName)}` <br>\n";
+                $message = "Migration 
+                                <span style='background: #ee0707; {$this->style}'>
+                                    Failed
+                                </span> Table exist on `{$traceTable}` <br>\n";
             }else{
                 $this->status_runned = true;
                 $message = "Migration runned 
                                 <span style='background: #027b02; {$this->style}'>
                                     Successfully
-                                </span> on 
-                                `{$this->traceable($this->tableName)}` <br>\n";
+                                </span> on
+                                `{$traceTable}` <br>\n";
             }
 
             // execute query
             if($this->status_runned){
-                $this->db->query( $this->MySQLTemplate() )->execute();
+                $this->db->query( $mysqlHandle['message'] )->execute();
             }
 
             return [
@@ -87,26 +125,39 @@ private function handle()
             ];
         } catch (PDOException $e){
             return ['response' => self::ERROR_404, 'message' => $e->getMessage()];
-            exit();
         }
     }
 
-    public function __destruct()
+    /**
+     * Save query data into sessions
+     * 
+     * @return void
+     */
+    public function __destruct() 
     {
-        // Blueprint handle
-        $handle = $this->handle();
-
-        if($handle['response'] !== self::ERROR_200){
-            echo preg_replace(
-                '/^[ \t]+|[ \t]+$/m', '', 
-                sprintf("<<\\Error code>> %s
-                    <br><br>
-                    <<\\PDO::ERROR>> %s <br>\n
-                ", $handle['response'], $handle['message'])
-            );
-            return;
+        $this->tempMigrationQuery($this->handle());
+    }
+
+    /**
+     * Check database connection error
+     * @param string $tableName 
+     * 
+     * @return mixed
+     */
+    private function checkDBConnect(?string $tableName = null)
+    {
+        // if database connection is okay
+        $dbConnection = $this->db->getConnection();
+        if($dbConnection['status'] !== self::ERROR_200){
+            return [
+                'status'    => self::ERROR_404,
+                'message'   => "Connection Error 
+                                    <span style='background: #ee0707; {$this->style}'>
+                                        Database Connection Error
+                                    </span> on `{$tableName}`
+                                    `{$dbConnection['message']}` <br>\n",
+            ];
         }
-        echo "{$handle['message']}";
     }
 
 }
diff --git a/src/Migrations/Migration.php b/src/Migrations/Migration.php
@@ -4,11 +4,12 @@
 
 namespace builder\Database\Migrations;
 
+use builder\Database\Constants;
 use builder\Database\Schema\OrmDotEnv;
 use builder\Database\Migrations\Traits\ManagerTrait;
 use builder\Database\Migrations\Traits\FilePathTrait;
 
-class Migration{
+class Migration extends Constants{
 
     use FilePathTrait,
         ManagerTrait;
@@ -17,6 +18,19 @@ class Migration{
     static private $migrations;
     static private $seeders;
     
+
+    /**
+     * Returns Session String
+     * 
+     * @return string
+     */
+    public static function getSession()
+    {
+        $instance = new self();
+        
+        return $instance->session;
+    }
+
     /**
      * Creating Managers
      * @param string $tableName 
@@ -97,7 +111,7 @@ static private function initBaseDirectory()
     static public function run(?string $type = null, ?string $column = null)
     {
         // read file inside folders
-        $readDir = self::initBaseDirectory();
+        $files = self::initBaseDirectory();
 
         // use default
         if(empty($type)){
@@ -106,17 +120,41 @@ static public function run(?string $type = null, ?string $column = null)
 
         // Check if method exist
         if(!in_array(strtolower($type), ['up', 'drop', 'column'])  || !method_exists(__CLASS__, strtolower($type))){
-            throw new \Exception( 
-                sprintf("The method or type `%s` you're trying to call doesn't exist", $type)
-            );
+            return [
+                'response'  => self::ERROR_404,
+                'message'   => sprintf("The method or type `%s` you're trying to call doesn't exist", $type)
+            ];
         }
 
         // run migration methods of included file
-        foreach($readDir as $dir){
-            $migration = include_once "{$dir}";
+        $errorMessage   = [];
+        $errorstatus    = self::ERROR_200;
+        foreach($files as $file){
+            $migration = include_once "{$file}";
 
+            // error
             $migration->{$type}($column);
+            
+            // handle migration query data
+            $handle = json_decode($_SESSION[self::getSession()] ?? [], true);
+
+            // store all messages
+            $errorMessage[] = $handle['message'];
+
+            // error occured stop code execution
+            if($handle['response'] != self::ERROR_200){
+                $errorstatus = self::ERROR_404;
+                break;
+            }
         }
+
+        // unset session
+        unset($_SESSION[self::getSession()]);
+
+        return [
+            'response'  => $errorstatus, 
+            'message'   => implode("\n", $errorMessage)
+        ];
     }
     
     /**
@@ -189,20 +227,18 @@ static public function create(?string $table_name, ?string $type = null)
      */
     public function up(){}
     
-
     /**
      * Drop database table
      *
-     * @return void
+     * @return mixed
      */
     public function drop(){}
-    
 
     /**
      * drop database column
      * @param string $column
      *
-     * @return void
+     * @return mixed
      */
     public function column(?string $column){}
 
@@ -241,7 +277,7 @@ static private function directoryfiles(?string $directory)
 
         // change value to absolute path to file
         array_walk($readDir, function(&$value, $index) use($directory) {
-            $value = "{$directory}/{$value}";
+            $value = rtrim($directory, '/') . "/{$value}";
         });
         
         return $readDir;
diff --git a/src/Migrations/Schema.php b/src/Migrations/Schema.php
diff --git a/src/Migrations/Traits/FilePathTrait.php b/src/Migrations/Traits/FilePathTrait.php

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`},`
`39`	`39`	`"extra": {`
`40`	`40`	`"branch-alias": {`
`41`		`- "dev-main": "4.1.3-dev"`
	`41`	`+ "dev-main": "4.1.4-dev"`
`42`	`42`	`}`
`43`	`43`	`},`
`44`	`44`	`"minimum-stability": "stable",`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,5 @@ public function __construct(?array $options = []) {`
`35`	`35`	`$this->configurePagination($options);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-`
`39`	`38`	`}`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function up()`
`27`	`27`	`*/`
`28`	`28`	`public function drop()`
`29`	`29`	`{`
`30`		`- Schema::dropTable('dummy_table');`
	`30`	`+ return Schema::dropTable('dummy_table');`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
`@@ -38,7 +38,7 @@ public function drop()`
`38`	`38`	`*/`
`39`	`39`	`public function column(?string $column)`
`40`	`40`	`{`
`41`		`- Schema::dropColumn('dummy_table', $column);`
	`41`	`+ return Schema::dropColumn('dummy_table', $column);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`};`