[FEATURE] Prequel now uses it's own database instance with the config…

… defined in config/prequel.php
Protoqol · Jul 9, 2019 · f1ab336 · f1ab336
1 parent b5ff88d
commit f1ab336
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 23 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/resources/assets/js/components/Header/Header.vue b/resources/assets/js/components/Header/Header.vue
@@ -32,7 +32,7 @@
                 <h1 v-if="activeTable">
                     <span v-if="!tableLoading" id="header-table-message">
                         <font-awesome-icon class="fa" icon="table"/>
-                        {{activeTable}} <small>({{ numberOfPages }} records)</small>
+                        {{ activeTable }} <small>({{ numberOfRecords }} records)</small>
                     </span>
                     <img v-else width="20" height="20" :src="$root.prequel.asset.loader" alt="Loading table data...">
                 </h1>
@@ -108,7 +108,7 @@
       'tableLoading',
       'tableStructure',
       'searchColumn',
-      'numberOfPages',
+      'numberOfRecords',
     ],
 
     data() {

diff --git a/src/Classes/Database/DatabaseConnector.php b/src/Classes/Database/DatabaseConnector.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Protoqol\Prequel\Classes\Database;
+
+use Illuminate\Database\Connection;
+use PDO;
+
+/**
+ * Class DatabaseConnector
+ *
+ * @package Protoqol\Prequel\Classes\Database
+ */
+class DatabaseConnector
+{
+
+    public $connection;
+
+    /**
+     * @return \Illuminate\Database\Connection
+     */
+    public function getConnection()
+    {
+        $this->connection = (new Connection($this->getPdo()));
+        return $this->connection;
+    }
+
+    /**
+     * @return \PDO
+     */
+    private function getPdo()
+    {
+        $dsn  = $this->constructDsn();
+        $user = config('prequel.DB.USERNAME');
+        $pass = config('prequel.DB.PASSWORD');
+
+        return new PDO($dsn, $user, $pass);
+    }
+
+    /**
+     * @return string
+     */
+    private function constructDsn()
+    {
+        $connection   = config('prequel.DB.CONNECTION');
+        $databaseName = config('prequel.DB.DATABASE');
+        $host         = config('prequel.DB.HOST');
+
+        return $connection.':dbname='.$databaseName.';host='.$host;
+    }
+}
diff --git a/src/Classes/Database/DatabaseTraverser.php b/src/Classes/Database/DatabaseTraverser.php
@@ -4,6 +4,7 @@
 
 namespace Protoqol\Prequel\Classes\Database;
 
+use Protoqol\Prequel\Classes\Database\DatabaseConnector;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
@@ -27,21 +28,28 @@ class DatabaseTraverser
     /**
      * Query collection based on $DB_CONN
      *
-     * @var $databaseQueries
+     * @var \Protoqol\Prequel\Classes\Database\SequelAdapter $databaseQueries
      */
     private $databaseQueries;
 
+    /**
+     * Holds custom database connection.
+     *
+     * @var \Illuminate\Database\Connection $connection
+     */
+    private $connection;
+
     /**
      * DatabaseTraverser constructor.
      *
-     * @param  string|null  $databaseType  Type of database see $_databaseConn
+     * @param  string|null  $databaseType
      */
     public function __construct(?string $databaseType = null)
     {
-        $this->databaseConn = $databaseType
-            ?: config('database.default');
-
+        $this->databaseConn    = $databaseType
+            ?: config('prequel.DB.CONNECTION');
         $this->databaseQueries = new SequelAdapter($this->databaseConn);
+        $this->connection      = (new DatabaseConnector())->getConnection();
     }
 
     /**
@@ -57,14 +65,12 @@ public function getAll() :array
         $flatTableCollection = [];
 
         foreach ($this->getAllDatabases() as $value) {
-            $databaseName = (object) $value['name'];
+            $databaseName = (object)$value['name'];
 
             if (array_key_exists($databaseName->official,
-                config('prequel.ignored'))
-            ) {
+                config('prequel.ignored'))) {
                 if (config('prequel.ignored.'.$databaseName->official)[0]
-                    === '*'
-                ) {
+                    === '*') {
                     continue;
                 }
             }
@@ -80,11 +86,14 @@ public function getAll() :array
             ) {
                 $tablesToIgnore = config('prequel.ignored.'
                         .$databaseName->official) ?? [];
-                if (!array_search($table['name']['official'],
-                    $tablesToIgnore)
-                ) {
+
+                if (!array_search(
+                    $table['name']['official'],
+                    $tablesToIgnore
+                )) {
                     $tableName = $databaseName->official.'.'
                         .$table['name']['official'];
+
                     array_push($flatTableCollection, $tableName);
                 } else {
                     unset($collection[$databaseName->pretty]['tables'][$key]);
@@ -154,7 +163,8 @@ public function getColumnData(
             'COLUMN_COMMENT',
         ];
 
-        $result = (DB::table("information_schema.COLUMNS")
+        $result = ($this->connection
+            ->table("information_schema.COLUMNS")
             ->select($select)
             ->where([
                 ['TABLE_SCHEMA', '=', $database],
@@ -163,7 +173,7 @@ public function getColumnData(
             ])
             ->get())->toArray();
 
-        return Arr::flatten((array) $result);
+        return Arr::flatten((array)$result);
     }
 
     /**
@@ -176,7 +186,7 @@ public function getColumnData(
      */
     public function getTableStructure(string $database, string $table) :array
     {
-        $columns = DB::select("SHOW COLUMNS FROM `$database`.`$table`");
+        $columns = $this->connection->select("SHOW COLUMNS FROM `$database`.`$table`");
         return $columns;
     }
 
@@ -190,7 +200,7 @@ public function getTableStructure(string $database, string $table) :array
      */
     public function getTablesFromDB(string $database) :array
     {
-        $tables = DB::select($this->databaseQueries->showTablesFrom($database));
+        $tables = $this->connection->select($this->databaseQueries->showTablesFrom($database));
         return $this->normalise($tables);
     }
 
@@ -202,7 +212,7 @@ public function getTablesFromDB(string $database) :array
      */
     public function getAllTables() :array
     {
-        $tables = DB::select($this->databaseQueries->showTables());
+        $tables = $this->connection->select($this->databaseQueries->showTables());
         return $this->normalise($tables);
     }
 
@@ -214,7 +224,7 @@ public function getAllTables() :array
      */
     public function getAllDatabases() :array
     {
-        $databases = DB::select($this->databaseQueries->showDatabases());
+        $databases = $this->connection->select($this->databaseQueries->showDatabases());
         return $this->normalise($databases);
     }
 
@@ -238,7 +248,7 @@ public function normalise(array $arr)
 
         for ($iterator = 0; $iterator < count($arr); $iterator++) {
             foreach ($arr[$iterator] as $value) {
-                $arrayValue = ((array) $value)[0];
+                $arrayValue = ((array)$value)[0];
 
                 $normalised[$iterator]['name'] = [
                     "official" => $arrayValue,

diff --git a/src/Http/Controllers/PrequelController.php b/src/Http/Controllers/PrequelController.php
@@ -5,6 +5,7 @@
 namespace Protoqol\Prequel\Http\Controllers;
 
 use Illuminate\Routing\Controller;
+use Protoqol\Prequel\Classes\Database\DatabaseConnector;
 use Protoqol\Prequel\Classes\Database\DatabaseTraverser;
 
 /**