diff --git a/src/Db/Connection.php b/src/Db/Connection.php index 572539f..e654014 100644 --- a/src/Db/Connection.php +++ b/src/Db/Connection.php @@ -2,7 +2,6 @@ namespace Bsr\Db; use Bsr\Db\Exception\SqlException; -use Gbili\Db\Req\Req; use Gbili\PDOWithFilters\PDOWithFilters; class Connection @@ -43,7 +42,7 @@ class Connection $statement->closeCursor(); - return new OdbcResultset($rows); + return new OdbcResultSet($rows); } /** diff --git a/src/Db/DbHelper.php b/src/Db/DbHelper.php index 2e4c80f..b5f9312 100644 --- a/src/Db/DbHelper.php +++ b/src/Db/DbHelper.php @@ -25,10 +25,10 @@ class DbHelper ORDER BY text;"; - $results = Connection::getReq()->getResultSet($sql); + $results = Connection::execute($sql); if($withJeunesse) { - array_unshift($results, array('code' => 'J', 'text' => 'Jeunesse')); + array_unshift($results->to_array(), array('code' => 'J', 'text' => 'Jeunesse')); } return $results; @@ -56,6 +56,6 @@ class DbHelper "titre" => $row['title'], "lecteur" => $row['displayName'] ); - }, Connection::getReq()->getResultSet($sql)); + }, Connection::execute($sql)->to_array()); } }