Implemented new autoload method and changed connection method to a ne…

…w and more efficient one
emagombe · Dec 6, 2019 · 89fd15a · 89fd15a
1 parent 92613e5
commit 89fd15a
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 48 deletions.
diff --git a/Examples/Delete.php b/Examples/Delete.php
@@ -4,6 +4,16 @@
 
 use queryBuilder\JsonQB as JQB;
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
+
 $sql = JQB::Delete('user', [
 	'where' => array(
 		array(

diff --git a/Examples/Example.php b/Examples/Example.php
@@ -3,6 +3,15 @@
 require '../autoload.php';
 
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
 
 // $qb = JsonQB::Insert('user', [
 // 	'value' => [

diff --git a/Examples/Insert.php b/Examples/Insert.php
@@ -4,6 +4,15 @@
 
 use queryBuilder\JsonQB as JQB;
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
 $sql = JQB::Insert('user',
 	array(
 		"value" => array(

diff --git a/Examples/Select.php b/Examples/Select.php
@@ -4,6 +4,16 @@
 
 use queryBuilder\JsonQB as JQB;
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
+
 $sql = JQB::Select(array(
 	"columns" => array("user.*", "user_type.*"),
 	"from" => array("user", "user_type"),

diff --git a/Examples/Truncate.php b/Examples/Truncate.php
@@ -4,6 +4,16 @@
 
 use queryBuilder\JsonQB as JQB;
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
+
 $sql = JQB::Truncate('user')->sql();
 
 print_r($sql);

diff --git a/Examples/Update.php b/Examples/Update.php
@@ -4,6 +4,15 @@
 
 use queryBuilder\JsonQB as JQB;
 
+JQB::connect([
+	'database' => '',
+	'host' => '',
+	'port' => '',
+	'username' => '',
+	'password' => '',
+	'charset' => '',
+]);
+
 $sql = JQB::Update('user', [
 	'value' => array(
 		'username' => 'example'

diff --git a/README.md b/README.md
@@ -20,14 +20,17 @@ require_once 'JsonQB/autoload.php';
 
 ## Database settings
 
-Setput your database connetion settings on **JsonQB/app.conf** file
-```script
-DATABASE=your_database
-HOST=your_host
-PORT=3306
-USERNAME=your_username
-PASSWORD=your_password
-CHARSET=utf8
+```php
+use queryBuilder\JsonQB as JQB;
+
+JQB::connect([
+	'database' => '',	# Database name
+	'host' => '',		# Host name
+	'port' => '',		# Connection port
+	'username' => '',	# Username
+	'password' => '',	# Password
+	'charset' => '',	# Charset
+]);
 ```
 
 ## Generating queries

diff --git a/app.conf b/app.conf
diff --git a/autoload.php b/autoload.php
@@ -1,12 +1,7 @@
-<?php 
+<?php
 
-require_once 'database/Settings.php';
-require_once 'database/Database.php';
-require_once 'security/Security.php';
-require_once 'queryBuilder/query/Where.php';
-require_once 'queryBuilder/query/Insert.php';
-require_once 'queryBuilder/query/Update.php';
-require_once 'queryBuilder/query/Delete.php';
-require_once 'queryBuilder/query/Select.php';
-require_once 'queryBuilder/query/Truncate.php';
-require_once 'queryBuilder/JsonQB.php';
+require_once __DIR__.'/vendor/autoload.php';
+
+spl_autoload_register(function ($class_name) {
+    require_once __DIR__.'/'.$class_name .'.php';
+});
diff --git a/database/Database.php b/database/Database.php
@@ -6,15 +6,16 @@
 use database\Settings;
 use PDO;
 
-class Database
-{
+class Database {
 
-	function __construct() {
-		return $this;
+	public static $connection_object = [];
+
+	public static function get_connection_object($connection_object) {
+		self::$connection_object = $connection_object;
 	}
 
 	public function conn() {
-		$config = $this->read_conf();
+		$config = (object) self::$connection_object;
 
 		$host = $config->host;
 		$database = $config->database;
@@ -29,22 +30,4 @@ public function conn() {
 			throw new Exception($ex->getMessage());
 		}
 	}
-
-	private function read_conf() {
-		$content = file_get_contents(dirname(__FILE__)."/../app.conf");
-		$content = explode("\n", $content);
-		$config = [];
-		foreach($content as $item) {
-			$items = explode("=", $item);
-			$config[strtolower($items[0])] = $items[1];
-		}
-		$settings = new Settings();
-		$settings->database = str_replace("\r", '', $config['database']);
-		$settings->username = str_replace("\r", '', $config['username']);
-		$settings->password = str_replace("\r", '', $config['password']);
-		$settings->charset = str_replace("\r", '', $config['charset']);
-		$settings->host = str_replace("\r", '', $config['host']);
-		$settings->port = str_replace("\r", '', $config['port']);
-		return $settings;
-	}
 }
diff --git a/queryBuilder/JsonQB.php b/queryBuilder/JsonQB.php
@@ -2,6 +2,7 @@
 
 namespace queryBuilder;
 
+use database\Database;
 use security\Security;
 use queryBuilder\query\Insert;
 use queryBuilder\query\Update;
@@ -11,6 +12,10 @@
 
 class JsonQB {
 
+	public static function connect($connection_object) {
+		Database::get_connection_object($connection_object);
+	}
+
 	public static function Insert($table, $request) {
 		return new Insert($table, $request);
 	}