moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +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

2
lib/adodb/drivers/adodb-access.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.

2
lib/adodb/drivers/adodb-ado.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.

4
lib/adodb/drivers/adodb-ado5.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.
@ -118,7 +118,7 @@ class ADODB_ado extends ADOConnection {
$dbc->CursorLocation = $this->_cursor_location;
return $dbc->State > 0;
} catch (exception $e) {
if ($this->debug);echo "<pre>",$argHostname,"\n",$e,"</pre>\n";
if ($this->debug) echo "<pre>",$argHostname,"\n",$e,"</pre>\n";
}
return false;

2
lib/adodb/drivers/adodb-ado_access.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.

2
lib/adodb/drivers/adodb-ado_mssql.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.

2
lib/adodb/drivers/adodb-borland_ibase.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.

2
lib/adodb/drivers/adodb-csv.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.

34
lib/adodb/drivers/adodb-db2.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
V5.06 16 Oct 2008 (c) 2006 John Lim (jlim#natsoft.com). All rights reserved.
V5.11 5 May 2010 (c) 2000-2010 (jlim#natsoft.com). All rights reserved.
This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL extension
for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2 or
@ -210,31 +210,19 @@ class ADODB_db2 extends ADOConnection {
function ServerInfo()
{
if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
$dsn = strtoupper($this->host);
$first = true;
$found = false;
if (!function_exists('db2_data_source')) return false;
while(true) {
$rez = @db2_data_source($this->_connectionID,
$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
$first = false;
if (!is_array($rez)) break;
if (strtoupper($rez['server']) == $dsn) {
$found = true;
break;
}
}
if (!$found) return ADOConnection::ServerInfo();
if (!isset($rez['version'])) $rez['version'] = '';
return $rez;
$row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info())
as INSTANCEINFO");
if ($row) {
$info['version'] = $row[0].':'.$row[1];
$info['fixpack'] = $row[1];
$info['description'] = '';
} else {
return ADOConnection::ServerInfo();
}
return $info;
}
function CreateSequence($seqname='adodbseq',$start=1)

2
lib/adodb/drivers/adodb-db2oci.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.

80
lib/adodb/drivers/adodb-db2ora.inc.php Normal file
View file

@ -0,0 +1,80 @@
<?php
/*
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.
Set tabs to 4 for best viewing.
Latest version is available at http://adodb.sourceforge.net
Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
*/
// security - hide paths
if (!defined('ADODB_DIR')) die();
include(ADODB_DIR."/drivers/adodb-db2.inc.php");
if (!defined('ADODB_DB2OCI')){
define('ADODB_DB2OCI',1);
function _colontrack($p)
{
global $_COLONARR,$_COLONSZ;
$v = (integer) substr($p,1);
if ($v > $_COLONSZ) return $p;
$_COLONARR[] = $v;
return '?';
}
function _colonscope($sql,$arr)
{
global $_COLONARR,$_COLONSZ;
$_COLONARR = array();
$_COLONSZ = sizeof($arr);
$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
if (empty($_COLONARR)) return array($sql,$arr);
foreach($_COLONARR as $k => $v) {
$arr2[] = $arr[$v];
}
return array($sql2,$arr2);
}
class ADODB_db2oci extends ADODB_db2 {
var $databaseType = "db2oci";
var $sysTimeStamp = 'sysdate';
var $sysDate = 'trunc(sysdate)';
function ADODB_db2oci()
{
$this->ADODB_db2();
}
function _Execute($sql, $inputarr)
{
if ($inputarr) list($sql,$inputarr) = _colonscope($sql, $inputarr);
return parent::_Execute($sql, $inputarr);
}
};
class ADORecordSet_db2oci extends ADORecordSet_odbc {
var $databaseType = "db2oci";
function ADORecordSet_db2oci($id,$mode=false)
{
return $this->ADORecordSet_db2($id,$mode);
}
}
} //define
?>

2
lib/adodb/drivers/adodb-fbsql.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
@version V5.06 16 Oct 2008 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
@version 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.

2
lib/adodb/drivers/adodb-firebird.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.

2
lib/adodb/drivers/adodb-ibase.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.

2
lib/adodb/drivers/adodb-informix.inc.php
View file

@ -1,6 +1,6 @@
<?php
/**
* @version V5.06 16 Oct 2008 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
* @version 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.

4
lib/adodb/drivers/adodb-informix72.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim. All rights reserved.
V5.11 5 May 2010 (c) 2000-2010 John Lim. 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.
@ -123,7 +123,7 @@ class ADODB_informix72 extends ADOConnection {
return true;
}
function RowLock($tables,$where,$col='1 as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if ($this->_autocommit) $this->BeginTrans();
return $this->GetOne("select $col from $tables where $where for update");

2
lib/adodb/drivers/adodb-ldap.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.

33
lib/adodb/drivers/adodb-mssql.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.
@ -366,8 +366,9 @@ class ADODB_mssql extends ADOConnection {
See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
*/
function RowLock($tables,$where,$col='top 1 null as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
if (!$this->transCnt) $this->BeginTrans();
return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
}
@ -476,7 +477,7 @@ order by constraint_name, referenced_table_name, keyno";
// "Stein-Aksel Basma" <basma@accelero.no>
// tested with MSSQL 2000
function MetaPrimaryKeys($table)
function MetaPrimaryKeys($table, $owner=false)
{
global $ADODB_FETCH_MODE;
@ -591,7 +592,7 @@ order by constraint_name, referenced_table_name, keyno";
return array($sql,$this->qstr($sql2),$max,$sql2);
}
function PrepareSP($sql)
function PrepareSP($sql,$param=true)
{
if (!$this->_has_mssql_init) {
ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
@ -911,11 +912,19 @@ class ADORecordset_mssql extends ADORecordSet {
if (is_array($this->fields)) {
if (ADODB_ASSOC_CASE == 0) {
foreach($this->fields as $k=>$v) {
$this->fields[strtolower($k)] = $v;
$kn = strtolower($k);
if ($kn <> $k) {
unset($this->fields[$k]);
$this->fields[$kn] = $v;
}
}
} else if (ADODB_ASSOC_CASE == 1) {
foreach($this->fields as $k=>$v) {
$this->fields[strtoupper($k)] = $v;
$kn = strtoupper($k);
if ($kn <> $k) {
unset($this->fields[$k]);
$this->fields[$kn] = $v;
}
}
}
}
@ -956,11 +965,19 @@ class ADORecordset_mssql extends ADORecordSet {
if (!$this->fields) {
} else if (ADODB_ASSOC_CASE == 0) {
foreach($this->fields as $k=>$v) {
$this->fields[strtolower($k)] = $v;
$kn = strtolower($k);
if ($kn <> $k) {
unset($this->fields[$k]);
$this->fields[$kn] = $v;
}
}
} else if (ADODB_ASSOC_CASE == 1) {
foreach($this->fields as $k=>$v) {
$this->fields[strtoupper($k)] = $v;
$kn = strtoupper($k);
if ($kn <> $k) {
unset($this->fields[$k]);
$this->fields[$kn] = $v;
}
}
}
} else {

2
lib/adodb/drivers/adodb-mssql_n.inc.php
View file

@ -9,7 +9,7 @@
// ADOdb - Database Abstraction Library for PHP //
// http://adodb.sourceforge.net/ //
// //
// Copyright (C) 2000-2009 John Lim (jlim\@natsoft.com.my) //
// Copyright (c) 2000-2010 John Lim (jlim\@natsoft.com.my) //
// All rights reserved. //
// Released under both BSD license and LGPL library license. //
// Whenever there is any discrepancy between the two licenses, //

7
lib/adodb/drivers/adodb-mssqlnative.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.
@ -330,8 +330,9 @@ class ADODB_mssqlnative extends ADOConnection {
See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
*/
function RowLock($tables,$where,$col='top 1 null as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
if (!$this->transCnt) $this->BeginTrans();
return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
}
@ -493,7 +494,7 @@ class ADODB_mssqlnative extends ADOConnection {
return ADORecordSet_array_mssql::UnixTimeStamp($v);
}
function &MetaIndexes($table,$primary=false)
function &MetaIndexes($table,$primary=false, $owner = false)
{
$table = $this->qstr($table);

2
lib/adodb/drivers/adodb-mssqlpo.inc.php
View file

@ -1,6 +1,6 @@
<?php
/**
* @version V5.06 16 Oct 2008 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
* @version 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.

5
lib/adodb/drivers/adodb-mysql.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.
@ -158,11 +158,12 @@ class ADODB_mysql extends ADOConnection {
function GetOne($sql,$inputarr=false)
{
global $ADODB_GETONE_EOF;
if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
$rs = $this->SelectLimit($sql,1,-1,$inputarr);
if ($rs) {
$rs->Close();
if ($rs->EOF) return false;
if ($rs->EOF) return $ADODB_GETONE_EOF;
return reset($rs->fields);
}
} else {

6
lib/adodb/drivers/adodb-mysqli.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.
@ -195,7 +195,7 @@ class ADODB_mysqli extends ADOConnection {
return true;
}
function RowLock($tables,$where='',$col='1 as adodb_ignore')
function RowLock($tables,$where='',$col='1 as adodbignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;
@ -309,7 +309,7 @@ class ADODB_mysqli extends ADOConnection {
}
function MetaIndexes ($table, $primary = FALSE)
function MetaIndexes ($table, $primary = FALSE, $owner = false)
{
// save old fetch mode
global $ADODB_FETCH_MODE;

4
lib/adodb/drivers/adodb-mysqlpo.inc.php
View file

@ -1,7 +1,7 @@
<?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.
@ -59,7 +59,7 @@ class ADODB_mysqlt extends ADODB_mysql {
return true;
}
function RowLock($tables,$where='',$col='1 as adodb_ignore')
function RowLock($tables,$where='',$col='1 as adodbignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;

4
lib/adodb/drivers/adodb-mysqlt.inc.php
View file

@ -1,7 +1,7 @@
<?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.
@ -76,7 +76,7 @@ class ADODB_mysqlt extends ADODB_mysql {
return $ok ? true : false;
}
function RowLock($tables,$where='',$col='1 as adodb_ignore')
function RowLock($tables,$where='',$col='1 as adodbignore')
{
if ($this->transCnt==0) $this->BeginTrans();
if ($where) $where = ' where '.$where;

2
lib/adodb/drivers/adodb-netezza.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.
First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
Based on the previous postgres drivers.

26
lib/adodb/drivers/adodb-oci8.inc.php
View file

@ -1,7 +1,7 @@
<?php
/*
version V5.06 16 Oct 2008 (c) 2000-2009 John Lim. All rights reserved.
version V5.11 5 May 2010 (c) 2000-2010 John Lim. All rights reserved.
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
@ -65,6 +65,11 @@ class ADODB_oci8 extends ADOConnection {
var $_initdate = true; // init date to YYYY-MM-DD
var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
var $metaColumnsSQL2 = "select column_name,data_type,data_length, data_scale, data_precision,
case when nullable = 'Y' then 'NULL'
else 'NOT NULL' end as nulls,
data_default from all_tab_cols
where owner='%s' and table_name='%s' order by column_id"; // when there is a schema
var $_bindInputArray = true;
var $hasGenID = true;
var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
@ -100,13 +105,19 @@ class ADODB_oci8 extends ADOConnection {
function MetaColumns($table, $normalize=true)
{
global $ADODB_FETCH_MODE;
$schema = '';
$this->_findschema($table, $schema);
$false = false;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
if ($schema)
$rs = $this->Execute(sprintf($this->metaColumnsSQL2, strtoupper($schema), strtoupper($table)));
else
$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
@ -114,7 +125,7 @@ class ADODB_oci8 extends ADOConnection {
return $false;
}
$retarr = array();
while (!$rs->EOF) { //print_r($rs->fields);
while (!$rs->EOF) {
$fld = new ADOFieldObject();
$fld->name = $rs->fields[0];
$fld->type = $rs->fields[1];
@ -322,7 +333,7 @@ NATSOFT.DOMAIN =
return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
}
function RowLock($tables,$where,$col='1 as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if ($this->autoCommit) $this->BeginTrans();
return $this->GetOne("select $col from $tables where $where for update");
@ -972,7 +983,7 @@ NATSOFT.DOMAIN =
ADOConnection::outp("<b>Bind</b>: LOB has been written to temp");
}
} else {
$this->_refLOBs[$numlob]['VAR'] = $var;
$this->_refLOBs[$numlob]['VAR'] = &$var;
}
$rez = $tmp;
} else {
@ -1398,6 +1409,7 @@ class ADORecordset_oci8 extends ADORecordSet {
$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
$sc = OCIColumnScale($this->_queryID, $fieldOffset);
if ($p != 0 && $sc == 0) $fld->type = 'INT';
$fld->scale = $p;
break;
case 'CLOB':

2
lib/adodb/drivers/adodb-oci805.inc.php
View file

@ -1,6 +1,6 @@
<?php
/**
* @version V5.06 16 Oct 2008 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
* @version 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.

2
lib/adodb/drivers/adodb-oci8po.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim. All rights reserved.
V5.11 5 May 2010 (c) 2000-2010 John Lim. 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.

8
lib/adodb/drivers/adodb-odbc.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.
@ -161,6 +161,12 @@ class ADODB_odbc extends ADOConnection {
$num += 1;
$this->genID = $num;
return $num;
} elseif ($this->affected_rows() == 0) {
// some drivers do not return a valid value => try with another method
$value = $this->GetOne("select id from $seq");
if ($value == $num + 1) {
return $value;
}
}
}
if ($fn = $this->raiseErrorFn) {

4
lib/adodb/drivers/adodb-odbc_db2.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.
@ -134,7 +134,7 @@ class ADODB_ODBC_DB2 extends ADODB_odbc {
return $this->GetOne($this->identitySQL);
}
function RowLock($tables,$where,$col='1 as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if ($this->_autocommit) $this->BeginTrans();
return $this->GetOne("select $col from $tables where $where for update");

3
lib/adodb/drivers/adodb-odbc_mssql.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.
@ -25,6 +25,7 @@ class ADODB_odbc_mssql extends ADODB_odbc {
var $fmtDate = "'Y-m-d'";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
var $_bindInputArray = true;
var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
var $hasTop = 'top'; // support mssql/interbase SELECT TOP 10 * FROM TABLE

2
lib/adodb/drivers/adodb-odbc_oracle.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.

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));

2
lib/adodb/drivers/adodb-odbtp_unicode.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.

2
lib/adodb/drivers/adodb-oracle.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.

2
lib/adodb/drivers/adodb-pdo.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.

2
lib/adodb/drivers/adodb-pdo_mssql.inc.php
View file

@ -2,7 +2,7 @@
/*
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.

2
lib/adodb/drivers/adodb-pdo_mysql.inc.php
View file

@ -2,7 +2,7 @@
/*
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.

2
lib/adodb/drivers/adodb-pdo_oci.inc.php
View file

@ -2,7 +2,7 @@
/*
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.

2
lib/adodb/drivers/adodb-pdo_pgsql.inc.php
View file

@ -1,7 +1,7 @@
<?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.

2
lib/adodb/drivers/adodb-pdo_sqlite.inc.php
View file

@ -1,7 +1,7 @@
<?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.

2
lib/adodb/drivers/adodb-postgres.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.

6
lib/adodb/drivers/adodb-postgres64.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.
@ -178,7 +178,7 @@ a different OID if a database must be reloaded. */
return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
}
function RowLock($tables,$where,$col='1 as ignore')
function RowLock($tables,$where,$col='1 as adodbignore')
{
if (!$this->transCnt) $this->BeginTrans();
return $this->GetOne("select $col from $tables where $where for update");
@ -584,7 +584,7 @@ select viewname,'V' from pg_views where viewname like $mask";
}
function MetaIndexes ($table, $primary = FALSE)
function MetaIndexes ($table, $primary = FALSE, $owner = false)
{
global $ADODB_FETCH_MODE;

2
lib/adodb/drivers/adodb-postgres7.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.

2
lib/adodb/drivers/adodb-postgres8.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.

2
lib/adodb/drivers/adodb-proxy.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.

4
lib/adodb/drivers/adodb-sapdb.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.
@ -53,7 +53,7 @@ class ADODB_SAPDB extends ADODB_odbc {
return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
}
function MetaIndexes ($table, $primary = FALSE)
function MetaIndexes ($table, $primary = FALSE, $owner = false)
{
$table = $this->Quote(strtoupper($table));

2
lib/adodb/drivers/adodb-sqlanywhere.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
version V5.06 16 Oct 2008 (c) 2000-2009 John Lim (jlim#natsoft.com). All rights
version V5.06 16 Oct 2008 (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,

4
lib/adodb/drivers/adodb-sqlite.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.
@ -261,7 +261,7 @@ class ADODB_sqlite extends ADOConnection {
return @sqlite_close($this->_connectionID);
}
function MetaIndexes($table, $primary = FALSE, $owner=false)
function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
{
$false = false;
// save old fetch mode

2
lib/adodb/drivers/adodb-sqlitepo.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.

2
lib/adodb/drivers/adodb-sybase.inc.php
View file

@ -1,6 +1,6 @@
<?php
/*
V5.10 10 Nov 2009 (c) 2000-2009 John Lim. All rights reserved.
V5.11 5 May 2010 (c) 2000-2010 John Lim. 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.

2
lib/adodb/drivers/adodb-sybase_ase.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.

2
lib/adodb/drivers/adodb-vfp.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.