From 50e0ef51335ce68b9c764cbaafbaa5151adb094b Mon Sep 17 00:00:00 2001 From: stronk7 Date: Sat, 17 May 2008 00:04:53 +0000 Subject: [PATCH] Fix one error in SetFetchMode() + minor clean. MDL-14879 --- lib/dml/mssql_adodb_moodle_database.php | 2 +- lib/dml/mssql_n_adodb_moodle_database.php | 23 +------------------- lib/dml/mysql_adodb_moodle_database.php | 2 -- lib/dml/mysqli_adodb_moodle_database.php | 2 +- lib/dml/oci8po_adodb_moodle_database.php | 2 +- lib/dml/odbc_mssql_adodb_moodle_database.php | 21 ------------------ lib/dml/postgres7_adodb_moodle_database.php | 2 +- 7 files changed, 5 insertions(+), 49 deletions(-) diff --git a/lib/dml/mssql_adodb_moodle_database.php b/lib/dml/mssql_adodb_moodle_database.php index c45eadc597..f6f2212273 100644 --- a/lib/dml/mssql_adodb_moodle_database.php +++ b/lib/dml/mssql_adodb_moodle_database.php @@ -20,7 +20,7 @@ class mssql_adodb_moodle_database extends adodb_moodle_database { if (!defined('ADODB_ASSOC_CASE')) { define ('ADODB_ASSOC_CASE', 2); } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); + $this->db->SetFetchMode(ADODB_FETCH_ASSOC); /// No need to set charset. It must be specified in the driver conf /// Allow quoted identifiers diff --git a/lib/dml/mssql_n_adodb_moodle_database.php b/lib/dml/mssql_n_adodb_moodle_database.php index 1e296daf60..17bf52e092 100644 --- a/lib/dml/mssql_n_adodb_moodle_database.php +++ b/lib/dml/mssql_n_adodb_moodle_database.php @@ -5,7 +5,7 @@ require_once($CFG->libdir.'/dml/adodb_moodle_database.php'); require_once($CFG->libdir.'/dml/mssql_adodb_moodle_database.php'); /** - * MSSQL database class using adodb backend + * MSSQL_N database class using adodb backend * @package dmlib */ class mssql_n_adodb_moodle_database extends mssql_adodb_moodle_database { @@ -21,25 +21,4 @@ class mssql_n_adodb_moodle_database extends mssql_adodb_moodle_database { return 'mssql_n'; } - protected function configure_dbconnection() { - if (!defined('ADODB_ASSOC_CASE')) { - define ('ADODB_ASSOC_CASE', 0); - } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); - - /// No need to set charset. It must be specified in the driver conf - /// Allow quoted identifiers - $this->db->Execute('SET QUOTED_IDENTIFIER ON'); - /// Force ANSI nulls so the NULL check was done by IS NULL and NOT IS NULL - /// instead of equal(=) and distinct(<>) simbols - $this->db->Execute('SET ANSI_NULLS ON'); - /// Enable sybase quotes, so addslashes and stripslashes will use "'" - ini_set('magic_quotes_sybase', '1'); - /// NOTE: Not 100% useful because GPC has been addslashed with the setting off - /// so IT'S MANDATORY TO CHANGE THIS UNDER php.ini or .htaccess for this DB - /// or to turn off magic_quotes to allow Moodle to do it properly - - return true; - } - } diff --git a/lib/dml/mysql_adodb_moodle_database.php b/lib/dml/mysql_adodb_moodle_database.php index 7adf87c2a3..4edab7f697 100644 --- a/lib/dml/mysql_adodb_moodle_database.php +++ b/lib/dml/mysql_adodb_moodle_database.php @@ -9,8 +9,6 @@ require_once($CFG->libdir.'/dml/mysqli_adodb_moodle_database.php'); * @package dmlib */ class mysql_adodb_moodle_database extends mysqli_adodb_moodle_database { - protected $columns = array(); - function __construct ($dbhost, $dbuser, $dbpass, $dbname, $dbpersist, $prefix) { parent::__construct($dbhost, $dbuser, $dbpass, $dbname, $dbpersist, $prefix); } diff --git a/lib/dml/mysqli_adodb_moodle_database.php b/lib/dml/mysqli_adodb_moodle_database.php index 08809719e3..72501dbf18 100644 --- a/lib/dml/mysqli_adodb_moodle_database.php +++ b/lib/dml/mysqli_adodb_moodle_database.php @@ -16,7 +16,7 @@ class mysqli_adodb_moodle_database extends adodb_moodle_database { if (!defined('ADODB_ASSOC_CASE')) { define ('ADODB_ASSOC_CASE', 2); } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); + $this->db->SetFetchMode(ADODB_FETCH_ASSOC); $this->db->Execute("SET NAMES 'utf8'"); return true; } diff --git a/lib/dml/oci8po_adodb_moodle_database.php b/lib/dml/oci8po_adodb_moodle_database.php index e8d86c1cb3..88d74f4d87 100644 --- a/lib/dml/oci8po_adodb_moodle_database.php +++ b/lib/dml/oci8po_adodb_moodle_database.php @@ -32,7 +32,7 @@ class oci8_adodb_moodle_database extends adodb_moodle_database { if (!defined('ADODB_PREFETCH_ROWS')) { define ('ADODB_PREFETCH_ROWS', 1000); } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); + $this->db->SetFetchMode(ADODB_FETCH_ASSOC); /// No need to set charset. It must be specified by the NLS_LANG env. variable /// Enable sybase quotes, so addslashes and stripslashes will use "'" diff --git a/lib/dml/odbc_mssql_adodb_moodle_database.php b/lib/dml/odbc_mssql_adodb_moodle_database.php index f626331325..2129e24d38 100644 --- a/lib/dml/odbc_mssql_adodb_moodle_database.php +++ b/lib/dml/odbc_mssql_adodb_moodle_database.php @@ -21,25 +21,4 @@ class odbc_mssql_adodb_moodle_database extends mssql_adodb_moodle_database { return 'odbc_mssql'; } - protected function configure_dbconnection() { - if (!defined('ADODB_ASSOC_CASE')) { - define ('ADODB_ASSOC_CASE', 0); - } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); - - /// No need to set charset. It must be specified in the driver conf - /// Allow quoted identifiers - $this->db->Execute('SET QUOTED_IDENTIFIER ON'); - /// Force ANSI nulls so the NULL check was done by IS NULL and NOT IS NULL - /// instead of equal(=) and distinct(<>) simbols - $this->db->Execute('SET ANSI_NULLS ON'); - /// Enable sybase quotes, so addslashes and stripslashes will use "'" - ini_set('magic_quotes_sybase', '1'); - /// NOTE: Not 100% useful because GPC has been addslashed with the setting off - /// so IT'S MANDATORY TO CHANGE THIS UNDER php.ini or .htaccess for this DB - /// or to turn off magic_quotes to allow Moodle to do it properly - - return true; - } - } diff --git a/lib/dml/postgres7_adodb_moodle_database.php b/lib/dml/postgres7_adodb_moodle_database.php index c6da6a9652..f0251867c7 100644 --- a/lib/dml/postgres7_adodb_moodle_database.php +++ b/lib/dml/postgres7_adodb_moodle_database.php @@ -75,7 +75,7 @@ class postgres7_adodb_moodle_database extends adodb_moodle_database { define ('ADODB_ASSOC_CASE', 2); } - $this->db->SetFetchMode(ADODB_ASSOC_CASE); + $this->db->SetFetchMode(ADODB_FETCH_ASSOC); $this->db->Execute("SET NAMES 'utf8'"); return true; -- 2.39.5