From 943c65bd46006be6521d9d7f0b954ee1a8874217 Mon Sep 17 00:00:00 2001
From: Guillermo Dev <public.guillermo@gmail.com>
Date: Mon, 15 Oct 2018 23:55:25 +0200
Subject: [PATCH] Connection is now using Gbili\Db\Req\Req underneath

---
 boot/bootstrap.php    |  5 +++++
 composer.json         |  7 ++++++-
 src/Db/Connection.php | 45 +++++++++++++------------------------------
 3 files changed, 24 insertions(+), 33 deletions(-)
 create mode 100644 boot/bootstrap.php

diff --git a/boot/bootstrap.php b/boot/bootstrap.php
new file mode 100644
index 0000000..6ae3945
--- /dev/null
+++ b/boot/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+use \Bsr\Utils\Configuration\Configuration;
+use \Gbili\Db\Req\AbstractReq;
+
+AbstractReq::generateAdapter(Configuration::get('db_req'));
diff --git a/composer.json b/composer.json
index 0afa1df..665e8f7 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,15 @@
         {
             "type" : "vcs",
             "url" : "https://usrpath@bitbucket.org/usrpath/bsrutils.git"
+        },
+        {
+            "type" : "vcs",
+            "url" : "https://usrpath@bitbucket.org/usrpath/gbilidbreq.git"
         }
     ],
     "require" : {
-        "bsr/utils" : "v2.0.1"
+        "bsr/utils" : "v2.0.1",
+        "gbili/dbreq" : "^0.0.2"
     },
     "autoload": {
         "psr-4": {"Bsr\\" : "src/"}
diff --git a/src/Db/Connection.php b/src/Db/Connection.php
index ca0184f..3acf3bf 100644
--- a/src/Db/Connection.php
+++ b/src/Db/Connection.php
@@ -3,13 +3,14 @@ namespace Bsr\Db;
 
 use Bsr\Utils\Configuration\Configuration;
 use Bsr\Db\Exception\SqlException;
+use Gbili\Db\Req\Req;
 
 class Connection
 {
-    // Internal variable to hold the connection
-    private static $db;
-
-    final private function __construct() {}
+    /**
+     * @var Gbili\Db\Req\Req
+     */
+    private static $req;
 
     /**
      * @param $query
@@ -17,40 +18,20 @@ class Connection
      * @return OdbcResultSet|resource|string
      * @throws SqlException
      */
-    public static function execute($query, $throw_error = false)
+    public static function execute($sql, $values)
     {
-        $result = odbc_exec(self::get(), utf8_decode($query));
-        $result = new OdbcResultSet($result);
-
-        if ($result->is_error()) {
-            if($throw_error) {
-                throw new SqlException($result->get_error(), $query);
-            }
-
-            return $result->get_error();
+        if (null === self::$req) {
+            self::$req = new Req();
         }
-
-        return $result;
+        return self::$req->getResultSet($sql, $values);
     }
 
+    /**
+     * @return PDO connection
+     */
     public static function get()
     {
-        if (is_null(self::$db)) {
-            $dsn = sprintf(
-                "Driver={%s};Server=%s,%s;Database=%s;",
-                Configuration::get('db.driver'),
-                Configuration::get('db.server'),
-                Configuration::get('db.port'),
-                Configuration::get('db.name')
-            );
-            self::$db = odbc_pconnect($dsn, Configuration::get('db.username'), Configuration::get('db.password'));
-
-            if (self::$db === false) {
-                throw new SqlException("Unable to connect to the server.");
-            }
-        }
-        // Return the connection
-        return self::$db;
+        return self::$req->getAdapter();
     }
 
     final private function __clone() {}