moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-24551 importing latest adodb 5.11

Browse source
This commit is contained in:
Petr Skoda 2010-10-06 15:31:49 +00:00
parent a02357dfbf
commit 6ede09aa83
120 changed files with 499 additions and 950 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/adodb/drivers/adodb-odbtp.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
V5.11 5 May 2010 (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence. See License.txt.
@ -172,7 +172,10 @@ class ADODB_odbtp extends ADOConnection{
//if uid & pwd can be separate
function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
{
$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
if ($argPassword && stripos($UserOrDSN,'DRIVER=') !== false) {
$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN.';PWD='.$argPassword);
} else
$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
if ($this->_connectionID === false) {
$this->_errorMsg = $this->ErrorMsg() ;
return false;
@ -551,7 +554,7 @@ class ADODB_odbtp extends ADOConnection{
}
}
function MetaIndexes_mssql($table,$primary=false)
function MetaIndexes_mssql($table,$primary=false, $owner = false)
{
$table = strtolower($this->qstr($table));