diff --git a/src/Db/Connection.php b/src/Db/Connection.php index 3acf3bf..478a097 100644 --- a/src/Db/Connection.php +++ b/src/Db/Connection.php @@ -18,12 +18,10 @@ class Connection * @return OdbcResultSet|resource|string * @throws SqlException */ - public static function execute($sql, $values) + public static function execute($sql, $values, $fetchMode = \PDO::FETCH_ASSOC) { - if (null === self::$req) { - self::$req = new Req(); - } - return self::$req->getResultSet($sql, $values); + $pdoStatement = self::getReq()->prepareAndExecuteStatement($sql, $values); + return new OdbcResultset($pdoStatement->fetchAll($fetchMode)); } /** @@ -31,7 +29,18 @@ class Connection */ public static function get() { - return self::$req->getAdapter(); + return self::getReq()->getAdapter(); + } + + /** + * @return Gbili\Db\Req\Req + */ + public static function getReq() + { + if (null === self::$req) { + self::$req = new Req(); + } + return self::$req; } final private function __clone() {} diff --git a/src/Db/DbHelper.php b/src/Db/DbHelper.php index 1b156a7..2e4c80f 100644 --- a/src/Db/DbHelper.php +++ b/src/Db/DbHelper.php @@ -25,7 +25,7 @@ class DbHelper ORDER BY text;"; - $results = Connection::execute($sql); + $results = Connection::getReq()->getResultSet($sql); if($withJeunesse) { array_unshift($results, array('code' => 'J', 'text' => 'Jeunesse')); @@ -56,6 +56,6 @@ class DbHelper "titre" => $row['title'], "lecteur" => $row['displayName'] ); - }, Connection::execute($sql)); + }, Connection::getReq()->getResultSet($sql)); } }