From ccfcd2e062b11f5eb622f33a1f659a95c59c2bf0 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Wed, 28 Jun 2017 15:52:02 +0200
Subject: [PATCH] FEAT #5628
---
core/class/class_db_pdo.php | 2 +-
core/class/class_db_pdo_statement.php | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/class/class_db_pdo.php b/core/class/class_db_pdo.php
index 8ba82092521..cd56d9441cc 100644
--- a/core/class/class_db_pdo.php
+++ b/core/class/class_db_pdo.php
@@ -34,7 +34,7 @@ class Database extends functions
*/
private static $preparedStmt = array();
- private $driver;
+ public $driver;
private $server;
private $port;
private $user;
diff --git a/core/class/class_db_pdo_statement.php b/core/class/class_db_pdo_statement.php
index ad03317d874..9958b2e3f0b 100644
--- a/core/class/class_db_pdo_statement.php
+++ b/core/class/class_db_pdo_statement.php
@@ -40,11 +40,10 @@ class MyPDOStatement
protected function nbResult()
{
$db = new Database();
- switch ($_SESSION['config']['databasetype']) {
- case 'POSTGRESQL' :
+ switch ($db->driver) {
+ case 'pgsql' :
return $this->pdoStatement->rowCount();
default :
- $db = new Database();
$query = "select count(1) as rc from (" . $this->pdoStatement->queryString . ")";
$stmtRC = $db->query($query, $this->queryArgs);
$fetch = $stmtRC->fetchObject();
@@ -54,11 +53,12 @@ class MyPDOStatement
protected function fetchMyObject()
{
- switch ($_SESSION['config']['databasetype']) {
- case 'POSTGRESQL' :
+ $db = new Database();
+ switch ($db->driver) {
+ case 'pgsql' :
//see later if special cases
return $this->pdoStatement->fetchObject();
- case 'ORACLE' :
+ case 'oci' :
$result = $this->pdoStatement->fetchObject();
//var_dump($result);
if ($result) {
--
GitLab