This function changes/adds new fields to your table. You don't
have to know if the col is new or not. It will check on its own.
*/
function ChangeTableSQL($tablename, $flds, $tableoptions = false)
{
+ global $ADODB_FETCH_MODE;
+
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
+
// check table exists
$cols = &$this->MetaColumns($tablename);
+
+ if (isset($savem)) $this->connection->SetFetchMode($savem);
+ $ADODB_FETCH_MODE = $save;
+
if ( empty($cols)) {
return $this->CreateTableSQL($tablename, $flds, $tableoptions);
}
+ if (is_array($flds)) {
+ // Cycle through the update fields, comparing
+ // existing fields to fields to update.
+ // if the Metatype and size is exactly the
+ // same, ignore - by Mark Newham
+ $holdflds = array();
+ foreach($flds as $k=>$v) {
+ if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+ $c = $cols[$k];
+ $ml = $c->max_length;
+ $mt = &$this->MetaType($c->type,$ml);
+ if ($ml == -1) $ml = '';
+ if ($mt == 'X') $ml = $v['SIZE'];
+ if (($mt != $v['TYPE']) || $ml != $v['SIZE']) {
+ $holdflds[$k] = $v;
+ }
+ } else {
+ $holdflds[$k] = $v;
+ }
+ }
+ $flds = $holdflds;
+ }
+
+
// already exists, alter table instead
list($lines,$pkey) = $this->_GenFields($flds);
$alter = 'ALTER TABLE ' . $this->TableName($tablename);
$sql = array();
-
+
foreach ( $lines as $id => $v ) {
if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+
+ $flds = Lens_ParseArgs($v,',');
+
+ // We are trying to change the size of the field, if not allowed, simply ignore the request.
+ if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;
+
$sql[] = $alter . $this->alterCol . ' ' . $v;
} else {
$sql[] = $alter . $this->addCol . ' ' . $v;
diff --git a/lib/adodb/adodb-error.inc.php b/lib/adodb/adodb-error.inc.php
index c595d3b0ec7..081a3dd2570 100644
--- a/lib/adodb/adodb-error.inc.php
+++ b/lib/adodb/adodb-error.inc.php
@@ -1,6 +1,6 @@
Execute("select * from adoxyz");
foreach($rs as $k => $v) {
- echo $k; print_r($v); echo "Error=".$this->ErrorNo().'
';
$first = true;
foreach($fieldArray as $k => $v) {
@@ -98,7 +103,7 @@ function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_
}
}
$insert = "INSERT INTO $table ($iCols) VALUES ($iVals)";
- $rs = $zthis->_Execute($insert);
+ $rs = $zthis->Execute($insert);
return ($rs) ? 2 : 0;
}
@@ -110,12 +115,12 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
if ($multiple or is_array($defstr)) {
if ($size==0) $size=5;
- $attr = " multiple size=$size";
+ $attr = ' multiple size="'.$size.'"';
if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = " size=$size";
+ } else if ($size) $attr = ' size="'.$size.'"';
else $attr ='';
-
- $s = "";
+
+ $s = '';
if ($blank1stItem)
if (is_string($blank1stItem)) {
$barr = explode(':',$blank1stItem);
@@ -179,7 +184,12 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
if ($zthis->dataProvider == 'oci8') {
$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
- $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
+
+ // Allow Oracle hints to be used for query optimization, Chris Wrye
+ if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) {
+ $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")";
+ } else
+ $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")";
} else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
@@ -218,7 +228,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
- $rstest = &$zthis->_Execute($rewritesql,$inputarr);
+ $rstest = &$zthis->Execute($rewritesql,$inputarr);
if ($rstest) {
$qryRecs = $rstest->RecordCount();
if ($qryRecs == -1) {
@@ -355,7 +365,7 @@ function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputar
return $rsreturn;
}
-function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$forcenulls=false)
+function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2)
{
if (!$rs) {
printf(ADODB_BAD_RS,'GetUpdateSQL');
@@ -376,8 +386,8 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// If the recordset field is one
// of the fields passed in then process.
$upperfname = strtoupper($field->name);
- if (adodb_key_exists($upperfname,$arrFields,$forcenulls)) {
-
+ if (adodb_key_exists($upperfname,$arrFields,$force)) {
+
// If the existing field value in the recordset
// is different from the value passed in then
// go ahead and append the field name and new value to
@@ -398,20 +408,52 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// Format the value properly for the database
$type = $rs->MetaType($field->type);
- // is_null requires php 4.0.4
- if (($forcenulls && is_null($arrFields[$upperfname])) ||
- $arrFields[$upperfname] === 'null') {
- $setFields .= $field->name . " = null, ";
- } else {
- if ($type == 'null') {
- $type = 'C';
- }
-
- if (strpos($upperfname,' ') !== false)
- $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
- else
- $fnameq = $upperfname;
+
+ if ($type == 'null') {
+ $type = 'C';
+ }
+
+ if (strpos($upperfname,' ') !== false)
+ $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
+ else
+ $fnameq = $upperfname;
+
+
+ // is_null requires php 4.0.4
+ //********************************************************//
+ if (is_null($arrFields[$upperfname])
+ || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
+ || $arrFields[$upperfname] === 'null'
+ )
+ {
+ switch ($force) {
+
+ //case 0:
+ // //Ignore empty values. This is allready handled in "adodb_key_exists" function.
+ //break;
+
+ case 1:
+ //Set null
+ $setFields .= $field->name . " = null, ";
+ break;
+ case 2:
+ //Set empty
+ $arrFields[$upperfname] = "";
+ $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq);
+ break;
+ default:
+ case 3:
+ //Set the value that was given in array, so you can give both null and empty values
+ if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') {
+ $setFields .= $field->name . " = null, ";
+ } else {
+ $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq);
+ }
+ break;
+ }
+ //********************************************************//
+ } else {
//we do this so each driver can customize the sql for
//DB specific column types.
//Oracle needs BLOB types to be handled with a returning clause
@@ -436,7 +478,8 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
// not a good hack, improvements?
if ($whereClause) {
if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard));
- else preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard);
+ else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard));
+ else preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard);
} else
$whereClause = array(false,false);
@@ -454,9 +497,9 @@ function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq
}
}
-function adodb_key_exists($key, &$arr,$forcenulls=false)
+function adodb_key_exists($key, &$arr,$force=2)
{
- if (!$forcenulls) {
+ if ($force<=0) {
// the following is the old behaviour where null or empty fields are ignored
return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0);
}
@@ -474,8 +517,12 @@ function adodb_key_exists($key, &$arr,$forcenulls=false)
*
*
*/
-function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=false)
+function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2)
{
+static $cacheRS = false;
+static $cacheSig = 0;
+static $cacheCols;
+
$tableName = '';
$values = '';
$fields = '';
@@ -494,11 +541,24 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=f
$rsclass = $zthis->rsPrefix.$zthis->databaseType;
$recordSet =& new $rsclass(-1,$zthis->fetchMode);
$recordSet->connection = &$zthis;
-
- $columns = $zthis->MetaColumns( $tableName );
+
+ if (is_string($cacheRS) && $cacheRS == $rs) {
+ $columns =& $cacheCols;
+ } else {
+ $columns = $zthis->MetaColumns( $tableName );
+ $cacheRS = $tableName;
+ $cacheCols = $columns;
+ }
} else if (is_subclass_of($rs, 'adorecordset')) {
- for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
- $columns[] = $rs->FetchField($i);
+ if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) {
+ $columns =& $cacheCols;
+ } else {
+ for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
+ $columns[] = $rs->FetchField($i);
+ $cacheRS = $cacheSig;
+ $cacheCols = $columns;
+ $rs->insertSig = $cacheSig++;
+ }
$recordSet =& $rs;
} else {
@@ -509,25 +569,49 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=f
// Loop through all of the fields in the recordset
foreach( $columns as $field ) {
$upperfname = strtoupper($field->name);
- if (adodb_key_exists($upperfname,$arrFields,$forcenulls)) {
-
- // Set the counter for the number of fields that will be inserted.
- $fieldInsertedCount++;
-
+ if (adodb_key_exists($upperfname,$arrFields,$force)) {
+ $bad = false;
if (strpos($upperfname,' ') !== false)
$fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote;
else
$fnameq = $upperfname;
-
- // Get the name of the fields to insert
- $fields .= $fnameq . ", ";
-
$type = $recordSet->MetaType($field->type);
+
+ /********************************************************/
+ if (is_null($arrFields[$upperfname])
+ || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0)
+ || $arrFields[$upperfname] === 'null'
+ )
+ {
+ switch ($force) {
+
+ case 0: // we must always set null if missing
+ $bad = true;
+ break;
+
+ case 1:
+ $values .= "null, ";
+ break;
- if (($forcenulls && is_null($arrFields[$upperfname])) ||
- $arrFields[$upperfname] === 'null') {
- $values .= "null, ";
+ case 2:
+ //Set empty
+ $arrFields[$upperfname] = "";
+ $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,$arrFields, $magicq);
+ break;
+
+ default:
+ case 3:
+ //Set the value that was given in array, so you can give both null and empty values
+ if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === 'null') {
+ $values .= "null, ";
+ } else {
+ $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq);
+ }
+ break;
+ } // switch
+
+ /*********************************************************/
} else {
//we do this so each driver can customize the sql for
//DB specific column types.
@@ -535,7 +619,15 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$forcenulls=f
//postgres has special needs as well
$values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,
$arrFields, $magicq);
- }
+ }
+
+ if ($bad) continue;
+ // Set the counter for the number of fields that will be inserted.
+ $fieldInsertedCount++;
+
+
+ // Get the name of the fields to insert
+ $fields .= $fnameq . ", ";
}
}
@@ -724,7 +816,7 @@ global $HTTP_SERVER_VARS;
if ($inBrowser) {
$ss = htmlspecialchars($ss);
if ($zthis->debug === -1)
- ADOConnection::outp( "$ss\n$ss\n$ss\n %% line %4d, file: %s " : "%% line %4d, file: %s";
- $MAXSTRLEN = 64;
+ $MAXSTRLEN = 128;
$s = ($html) ? '' : '';
diff --git a/lib/adodb/adodb-pager.inc.php b/lib/adodb/adodb-pager.inc.php
index 09caa2671d4..eade0083558 100644
--- a/lib/adodb/adodb-pager.inc.php
+++ b/lib/adodb/adodb-pager.inc.php
@@ -1,7 +1,7 @@
rows = $rows;
+ if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL;
+
$savec = $ADODB_COUNTRECS;
if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true;
if ($this->cache)
diff --git a/lib/adodb/adodb-pear.inc.php b/lib/adodb/adodb-pear.inc.php
index 69de43966aa..c9c81bff35b 100644
--- a/lib/adodb/adodb-pear.inc.php
+++ b/lib/adodb/adodb-pear.inc.php
@@ -1,6 +1,6 @@
$v) {
switch(strtolower($k)) {
+ case 'persist':
case 'persistent': $persist = $v; break;
#ibase
case 'dialect': $obj->dialect = $v; break;
@@ -204,9 +210,10 @@ class DB
*/
function isError($value)
{
- return (is_object($value) &&
- (get_class($value) == 'db_error' ||
- is_subclass_of($value, 'db_error')));
+ if (!is_object($value)) return false;
+ $class = get_class($value);
+ return $class == 'pear_error' || is_subclass_of($value, 'pear_error') ||
+ $class == 'db_error' || is_subclass_of($value, 'db_error');
}
@@ -221,9 +228,11 @@ class DB
*/
function isWarning($value)
{
+ return false;
+ /*
return is_object($value) &&
(get_class( $value ) == "db_warning" ||
- is_subclass_of($value, "db_warning"));
+ is_subclass_of($value, "db_warning"));*/
}
/**
diff --git a/lib/adodb/adodb-perf.inc.php b/lib/adodb/adodb-perf.inc.php
index 3aad11aff58..f417d1620fe 100644
--- a/lib/adodb/adodb-perf.inc.php
+++ b/lib/adodb/adodb-perf.inc.php
@@ -1,6 +1,6 @@
debug = $dbg;
}
if (isset($HTTP_SERVER_VARS['HTTP_HOST'])) {
- $tracer .= 'LOGSQL Insert Failed : $isqlLOGSQL Insert Failed : $isql
");
$conn->_logsql = false;
}
}
@@ -293,7 +296,7 @@ Committed_AS: 348732 kB
$d_system = $info[2] - $last[2];
$d_idle = $info[3] - $last[3];
- //printf("Delta - User: %f Nice: %f System: %f Idle: %fScripts Affected ';
foreach($arr as $k) {
- $s .= sprintf("%4d",$k[0]).' '.strip_tags($k[1]).'$this->helpurl. ".$this->conn->ErrorMsg()."
";
$s = "Suspicious SQL
-The following SQL have high average execution times The following SQL have high average execution times Avg Time Count SQL Max Min ";
+ $prefix = " ";
$suffix = " ";
if ($this->explain == false || strlen($prefix)>$max) {
$suffix = ' ... String too long for GET parameter: '.strlen($prefix).' ';
@@ -456,6 +461,8 @@ Committed_AS: 348732 kB
$sql1 = $this->sql1;
$save = $ADODB_FETCH_MODE;
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+
$rs =& $this->conn->SelectLimit(
"select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer
from $perf_table
@@ -463,12 +470,12 @@ Committed_AS: 348732 kB
and (tracer is null or tracer not like 'ERROR:%')
group by sql1
order by 1 desc",$numsql);
-
+ if (isset($savem)) $this->conn->SetFetchMode($savem);
$this->conn->fnExecute = $saveE;
$ADODB_FETCH_MODE = $save;
if (!$rs) return "$this->helpurl. ".$this->conn->ErrorMsg()."
";
$s = "Expensive SQL
-Tuning the following SQL will reduce the server load substantially Tuning the following SQL will reduce the server load substantially Load Count SQL Max Min ";
+ $prefix = " ";
$suffix = " ";
if($this->explain == false || strlen($prefix>$max)) {
$prefix = '';
@@ -639,7 +646,7 @@ Committed_AS: 348732 kB
break;
case 'poll':
echo "";
+ src=\"{$HTTP_SERVER_VARS['PHP_SELF']}?do=poll2&hidem=1\">";
break;
case 'poll2':
echo "";
@@ -653,7 +660,7 @@ Committed_AS: 348732 kB
break;
case 'viewsql':
if (empty($HTTP_GET_VARS['hidem']))
- echo " Clear SQL Log Clear SQL Log No Recordset returned
";
+ print "No Recordset returned
";
}
}
} // foreach
diff --git a/lib/adodb/adodb-php4.inc.php b/lib/adodb/adodb-php4.inc.php
index 13925b5632a..e63a570fd5d 100644
--- a/lib/adodb/adodb-php4.inc.php
+++ b/lib/adodb/adodb-php4.inc.php
@@ -1,7 +1,7 @@
$y1 error$y1 error Testing gregorian <=> julian conversion
";
$t = adodb_mktime(0,0,0,10,11,1492);
//http://www.holidayorigins.com/html/columbus_day.html - Friday check
- if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landingError in gregorian correction = ".($diff/3600/24)." days Error in gregorian correction = ".($diff/3600/24)." days Error ')."Error ')."Error ')."Error ')."
Testing overflow
";
$t = adodb_mktime(0,0,0,3,33,1965);
- if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1
";
- if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
Testing date formating
";
@@ -376,7 +385,7 @@ function adodb_date_test()
$s1 = date($fmt,0);
$s2 = adodb_date($fmt,0);
if ($s1 != $s2) {
- print " date() 0 failed";
+ //print "$s1
";
$pos = strcmp($s1,$s2);
if (($s1) != ($s2)) {
@@ -394,9 +403,9 @@ function adodb_date_test()
break;
}
}
- print "Error date(): $ts
+ print "Error date(): $ts
\"$s1\" (date len=".strlen($s1).")
- \"$s2\" (adodb_date len=".strlen($s2).")
Error getdate() $ts Error getdate() $ts ";
$fail = true;
@@ -452,7 +461,7 @@ function adodb_date_test()
}
$cnt += 1;
}
- echo "Tested $cnt dates
Passed !
";
else print "Failed :-(
";
}
@@ -485,13 +494,13 @@ Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 1
$year--;
}
- $day = ( floor((13 * $month - 1) / 5) +
+ $day = floor((13 * $month - 1) / 5) +
$day + ($year % 100) +
floor(($year % 100) / 4) +
floor(($year / 100) / 4) - 2 *
- floor($year / 100) + 77);
+ floor($year / 100) + 77 + $greg_correction;
- return (($day - 7 * floor($day / 7))) + $greg_correction;
+ return $day - 7 * floor($day / 7);
}
@@ -597,7 +606,7 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
$d365 = $_day_power * 365;
if ($d < 0) {
- $origd = $d;
+ if ($is_gmt) $origd = $d;
// The valid range of a 32bit signed timestamp is typically from
// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
for ($a = 1970 ; --$a >= 0;) {
@@ -611,7 +620,6 @@ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
break;
}
}
-
$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
$d = $lastd;
@@ -793,7 +801,7 @@ static $daylight;
case 'S':
$d10 = $day % 10;
if ($d10 == 1) $dates .= 'st';
- else if ($d10 == 2) $dates .= 'nd';
+ else if ($d10 == 2 && $day != 12) $dates .= 'nd';
else if ($d10 == 3) $dates .= 'rd';
else $dates .= 'th';
break;
@@ -877,22 +885,31 @@ function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=
function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
{
if (!defined('ADODB_TEST_DATES')) {
+
+ if ($mon === false) {
+ return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
+ }
+
// for windows, we don't check 1970 because with timezone differences,
// 1 Jan 1970 could generate negative timestamp, which is illegal
if (1971 < $year && $year < 2038
- || $mon === false
|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
- )
- return $is_gmt?
+ ) {
+ return $is_gmt ?
@gmmktime($hr,$min,$sec,$mon,$day,$year):
@mktime($hr,$min,$sec,$mon,$day,$year);
+ }
}
$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-
+
+ /*
+ # disabled because some people place large values in $sec.
+ # however we need it for $mon because we use an array...
$hr = intval($hr);
$min = intval($min);
$sec = intval($sec);
+ */
$mon = intval($mon);
$day = intval($day);
$year = intval($year);
diff --git a/lib/adodb/adodb-xmlschema.inc.php b/lib/adodb/adodb-xmlschema.inc.php
index a395de7074c..a84cbc0365d 100644
--- a/lib/adodb/adodb-xmlschema.inc.php
+++ b/lib/adodb/adodb-xmlschema.inc.php
@@ -1917,7 +1917,7 @@ class adoSchema {
$schema .= ' ' . "\n";
// grab details from database
- $rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
+ $rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
$fields = $this->db->MetaColumns( $table );
$indexes = $this->db->MetaIndexes( $table );
@@ -1983,7 +1983,7 @@ class adoSchema {
while( $row = $rs->FetchRow() ) {
foreach( $row as $key => $val ) {
- $row[$key] = htmlentities($row);
+ $row[$key] = htmlentities($val);
}
$schema .= ' ' . implode( ' ', $row ) . ' |
' . "\n";
diff --git a/lib/adodb/adodb.inc.php b/lib/adodb/adodb.inc.php
index dfec7f16671..8a3e21fece1 100644
--- a/lib/adodb/adodb.inc.php
+++ b/lib/adodb/adodb.inc.php
@@ -14,7 +14,7 @@
/**
\mainpage
- @version V4.50 6 July 2004 (c) 2000-2004 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.60 24 Jan 2005 (c) 2000-2005 John Lim (jlim#natsoft.com.my). All rights reserved.
Released under both BSD license and Lesser GPL library license. You can choose which license
you prefer.
@@ -26,9 +26,9 @@
We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
- other databases via ODBC.
-
- Latest Download at http://php.weblogs.com/adodbBad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
');
// allow [ ] @ ` " and . in table names
- define('ADODB_TABLE_REGEX','([]0-9a-z_\"\`\.\@\[-]*)');
+ define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
// prefetching used by oracle
if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
@@ -132,10 +150,13 @@
$ADODB_vers, // database version
$ADODB_COUNTRECS, // count number of records returned - slows down query
$ADODB_CACHE_DIR, // directory to cache recordsets
- $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE,
+ $ADODB_FORCE_TYPE;
$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
-
+ $ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
+
+
if (!isset($ADODB_CACHE_DIR)) {
$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
} else {
@@ -151,7 +172,7 @@
/**
* ADODB version as a string.
*/
- $ADODB_vers = 'V4.50 6 July 2004 (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+ $ADODB_vers = 'V4.60 24 Jan 2005 (c) 2000-2005 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
/**
* Determines whether recordset->RecordCount() is used.
@@ -219,7 +240,7 @@
var $user = ''; /// The username which is used to connect to the database server.
var $password = ''; /// Password for the username. For security, we no longer store it.
var $debug = false; /// if set to true will output sql statements
- var $maxblobsize = 256000; /// maximum size of blobs or large text fields -- some databases die otherwise like foxpro
+ var $maxblobsize = 262144; /// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase
var $substr = 'substr'; /// substring operator
var $length = 'length'; /// string length operator
@@ -231,7 +252,7 @@
var $false = '0'; /// string that represents FALSE for a database
var $replaceQuote = "\\'"; /// string to use to replace quotes
var $nameQuote = '"'; /// string to use to quote identifiers and names
- var $charSet=false; /// character set to use - only for interbase
+ var $charSet=false; /// character set to use - only for interbase, postgres and oci8
var $metaDatabasesSQL = '';
var $metaTablesSQL = '';
var $uniqueOrderBy = false; /// All order by columns have to be unique
@@ -322,6 +343,11 @@
return array('description' => '', 'version' => '');
}
+ function IsConnected()
+ {
+ return !empty($this->_connectionID);
+ }
+
function _findvers($str)
{
if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
@@ -346,7 +372,7 @@
return;
}
- if ($newline) $msg .= "
+ // from Ron Baldwin
// Only quote string types
- if (gettype($v) == 'string')
+ $typ = gettype($v);
+ if ($typ == 'string')
$sql .= $this->qstr($v);
+ else if ($typ == 'double')
+ $sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
else if ($v === null)
$sql .= 'NULL';
else
$sql .= $v;
$i += 1;
}
- $sql .= $sqlarr[$i];
-
- if ($i+1 != sizeof($sqlarr))
- ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
+ if (isset($sqlarr[$i])) {
+ $sql .= $sqlarr[$i];
+ if ($i+1 != sizeof($sqlarr)) ADOConnection::outp( "Input Array does not match ?: ".htmlspecialchars($sql));
+ } else if ($i != sizeof($sqlarr))
+ ADOConnection::outp( "Input array does not match ?: ".htmlspecialchars($sql));
$ret =& $this->_Execute($sql);
if (!$ret) return $ret;
@@ -808,7 +841,7 @@
}
- function& _Execute($sql,$inputarr=false)
+ function &_Execute($sql,$inputarr=false)
{
if ($this->debug) {
@@ -829,8 +862,8 @@
if ($fn) {
$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
}
-
- return false;
+ $false = false;
+ return $false;
}
if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
@@ -864,7 +897,7 @@
return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
}
- function DropSequence($seqname)
+ function DropSequence($seqname='adodbseq')
{
if (empty($this->_dropSeqSQL)) return false;
return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
@@ -887,7 +920,7 @@
$getnext = sprintf($this->_genIDSQL,$seqname);
$holdtransOK = $this->_transOK;
- $rs = @$this->Execute($getnext);
+ @($rs = $this->Execute($getnext));
if (!$rs) {
$this->_transOK = $holdtransOK; //if the status was ok before reset
$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
@@ -902,12 +935,14 @@
}
/**
+ * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
+ * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
* @return the last inserted ID. Not all databases support this.
*/
- function Insert_ID()
+ function Insert_ID($table='',$column='')
{
if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
- if ($this->hasInsertID) return $this->_insertid();
+ if ($this->hasInsertID) return $this->_insertid($table,$column);
if ($this->debug) {
ADOConnection::outp( 'Insert_ID error
');
adodb_backtrace();
@@ -917,7 +952,7 @@
/**
- * Portable Insert ID. Pablo Roca
+ * Portable Insert ID. Pablo Roca
*
* @return the last inserted ID. All databases support this. But aware possible
* problems in multiuser environments. Heavy test this before deploying.
@@ -925,7 +960,7 @@
function PO_Insert_ID($table="", $id="")
{
if ($this->hasInsertID){
- return $this->Insert_ID();
+ return $this->Insert_ID($table,$id);
} else {
return $this->GetOne("SELECT MAX($id) FROM $table");
}
@@ -1124,8 +1159,10 @@
*/
function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
{
- if (! $rs) return false;
-
+ if (! $rs) {
+ $false = false;
+ return $false;
+ }
$dbtype = $rs->databaseType;
if (!$dbtype) {
$rs = &$rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
@@ -1152,6 +1189,7 @@
$rs2->sql = $rs->sql;
$rs2->dataProvider = $this->dataProvider;
$rs2->InitArrayFields($arr,$flds);
+ $rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
return $rs2;
}
@@ -1167,8 +1205,10 @@
function &GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
{
$rs =& $this->Execute($sql, $inputarr);
- if (!$rs) return false;
-
+ if (!$rs) {
+ $false = false;
+ return $false;
+ }
$arr =& $rs->GetAssoc($force_array,$first2cols);
return $arr;
}
@@ -1180,8 +1220,10 @@
$force_array = $inputarr;
}
$rs =& $this->CacheExecute($secs2cache, $sql, $inputarr);
- if (!$rs) return false;
-
+ if (!$rs) {
+ $false = false;
+ return $false;
+ }
$arr =& $rs->GetAssoc($force_array,$first2cols);
return $arr;
}
@@ -1293,7 +1335,10 @@
$ADODB_COUNTRECS = $savec;
if (!$rs)
if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
- else return false;
+ else {
+ $false = false;
+ return $false;
+ }
$arr =& $rs->GetArray();
$rs->Close();
return $arr;
@@ -1315,8 +1360,10 @@
if (!$rs)
if (defined('ADODB_PEAR')) return ADODB_PEAR_Error();
- else return false;
-
+ else {
+ $false = false;
+ return $false;
+ }
$arr =& $rs->GetArray();
$rs->Close();
return $arr;
@@ -1346,7 +1393,8 @@
return $arr;
}
- return false;
+ $false = false;
+ return $false;
}
function &CacheGetRow($secs2cache,$sql=false,$inputarr=false)
@@ -1358,7 +1406,8 @@
$rs->Close();
return $arr;
}
- return false;
+ $false = false;
+ return $false;
}
/**
@@ -1434,11 +1483,12 @@
if (strncmp(PHP_OS,'WIN',3) === 0) {
$cmd = 'del /s '.str_replace('/','\\',$ADODB_CACHE_DIR).'\adodb_*.cache';
} else {
- $cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/??/adodb_*.cache';
+ //$cmd = 'find "'.$ADODB_CACHE_DIR.'" -type f -maxdepth 1 -print0 | xargs -0 rm -f';
+ $cmd = 'rm -rf '.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/';
// old version 'rm -f `find '.$ADODB_CACHE_DIR.' -name adodb_*.cache`';
}
if ($this->debug) {
- ADOConnection::outp( "CacheFlush: $cmd\n", system($cmd)," ");
+ ADOConnection::outp( "CacheFlush: $cmd\n", system($cmd)," ");
} else {
exec($cmd);
}
@@ -1520,7 +1570,7 @@
$err = '';
if ($secs2cache > 0){
- $rs = &csv2rs($md5file,$err,$secs2cache);
+ $rs = &csv2rs($md5file,$err,$secs2cache,$this->arrayClass);
$this->numCacheHits += 1;
} else {
$err='Timeout 1';
@@ -1535,7 +1585,9 @@
}
if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
}
+
$rs = &$this->Execute($sql,$inputarr);
+
if ($rs) {
$eof = $rs->EOF;
$rs = &$this->_rs2rs($rs); // read entire recordset into memory immediately
@@ -1580,6 +1632,45 @@
}
+ /*
+ Similar to PEAR DB's autoExecute(), except that
+ $mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+ If $mode == 'UPDATE', then $where is compulsory as a safety measure.
+
+ $forceUpdate means that even if the data has not changed, perform update.
+ */
+ function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
+ {
+ //$flds = array_keys($fields_values);
+ //$fldstr = implode(', ',$flds);
+ $sql = 'SELECT * FROM '.$table;
+ if ($where!==FALSE) $sql .= ' WHERE '.$where;
+ else if ($mode == 'UPDATE') {
+ ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
+ return false;
+ }
+
+ $rs =& $this->SelectLimit($sql,1);
+ if (!$rs) return false; // table does not exist
+
+ switch((string) $mode) {
+ case 'UPDATE':
+ case '2':
+ $sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
+ break;
+ case 'INSERT':
+ case '1':
+ $sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
+ break;
+ default:
+ ADOConnection::outp("AutoExecute: Unknown mode=$mode");
+ return false;
+ }
+ if ($sql) return $this->Execute($sql);
+ return false;
+ }
+
+
/**
* Generates an Update Query based on an existing recordset.
* $arrFields is an associative array of fields with the value
@@ -1591,16 +1682,25 @@
*
* "Jonathan Younger"
*/
- function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$forcenulls=null)
+ function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
{
global $ADODB_INCLUDED_LIB;
- if (!isset($forcenulls)) {
- $forcenulls = defined('ADODB_FORCE_NULLS') ? true : false;
+
+ //********************************************************//
+ //This is here to maintain compatibility
+ //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+ if (!isset($force)) {
+ global $ADODB_FORCE_TYPE;
+ $force = $ADODB_FORCE_TYPE;
}
+ //********************************************************//
+
if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
- return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$forcenulls);
+ return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
}
+
+
/**
* Generates an Insert Query based on an existing recordset.
@@ -1610,14 +1710,16 @@
* Note: This function should only be used on a recordset
* that is run against a single table.
*/
- function GetInsertSQL(&$rs, $arrFields,$magicq=false,$forcenulls=null)
+ function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
{
global $ADODB_INCLUDED_LIB;
- if (!isset($forcenulls)) {
- $forcenulls = defined('ADODB_FORCE_NULLS') ? true : false;
+ if (!isset($force)) {
+ global $ADODB_FORCE_TYPE;
+ $force = $ADODB_FORCE_TYPE;
+
}
if (empty($ADODB_INCLUDED_LIB)) include_once(ADODB_DIR.'/adodb-lib.inc.php');
- return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$forcenulls);
+ return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
}
@@ -1723,22 +1825,32 @@
$this->locale = $locale;
switch ($locale)
{
- default:
case 'En':
- $this->fmtDate="Y-m-d";
- $this->fmtTimeStamp = "Y-m-d H:i:s";
+ $this->fmtDate="'Y-m-d'";
+ $this->fmtTimeStamp = "'Y-m-d H:i:s'";
break;
-
+
+ case 'Us':
+ $this->fmtDate = "'m-d-Y'";
+ $this->fmtTimeStamp = "'m-d-Y H:i:s'";
+ break;
+
+ case 'Nl':
case 'Fr':
case 'Ro':
case 'It':
- $this->fmtDate="d-m-Y";
- $this->fmtTimeStamp = "d-m-Y H:i:s";
+ $this->fmtDate="'d-m-Y'";
+ $this->fmtTimeStamp = "'d-m-Y H:i:s'";
break;
case 'Ge':
- $this->fmtDate="d.m.Y";
- $this->fmtTimeStamp = "d.m.Y H:i:s";
+ $this->fmtDate="'d.m.Y'";
+ $this->fmtTimeStamp = "'d.m.Y H:i:s'";
+ break;
+
+ default:
+ $this->fmtDate="'Y-m-d'";
+ $this->fmtTimeStamp = "'Y-m-d H:i:s'";
break;
}
}
@@ -1747,14 +1859,11 @@
/**
* Close Connection
*/
- function Close()
+ function Close()
{
- return $this->_close();
-
- // "Simon Lee" reports that persistent connections need
- // to be closed too!
- //if ($this->_isPersistentConnection != true) return $this->_close();
- //else return true;
+ $rez = $this->_close();
+ $this->_connectionID = false;
+ return $rez;
}
/**
@@ -1825,8 +1934,11 @@
{
global $ADODB_FETCH_MODE;
- if ($mask) return false;
+ $false = false;
+ if ($mask) {
+ return $false;
+ }
if ($this->metaTablesSQL) {
// complicated state saving by the need for backward compat
$save = $ADODB_FETCH_MODE;
@@ -1838,7 +1950,7 @@
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
- if ($rs === false) return false;
+ if ($rs === false) return $false;
$arr =& $rs->GetArray();
$arr2 = array();
@@ -1859,7 +1971,7 @@
$rs->Close();
return $arr2;
}
- return false;
+ return $false;
}
@@ -1885,6 +1997,8 @@
{
global $ADODB_FETCH_MODE;
+ $false = false;
+
if (!empty($this->metaColumnsSQL)) {
$schema = false;
@@ -1896,7 +2010,7 @@
$rs = $this->Execute(sprintf($this->metaColumnsSQL,($upper)?strtoupper($table):$table));
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
- if ($rs === false) return false;
+ if ($rs === false || $rs->EOF) return $false;
$retarr = array();
while (!$rs->EOF) { //print_r($rs->fields);
@@ -1917,19 +2031,31 @@
$rs->Close();
return $retarr;
}
- return false;
+ return $false;
}
/**
* List indexes on a table as an array.
- * @param table table name to query
- * @param primary include primary keys.
+ * @param table table name to query
+ * @param primary true to only show primary keys. Not actually used for most databases
*
- * @return array of indexes on current table.
+ * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+
+ Array (
+ [name_of_index] => Array
+ (
+ [unique] => true or false
+ [columns] => Array
+ (
+ [0] => firstname
+ [1] => lastname
+ )
+ )
*/
function &MetaIndexes($table, $primary = false, $owner = false)
{
- return FALSE;
+ $false = false;
+ return false;
}
/**
@@ -1941,8 +2067,10 @@
function &MetaColumnNames($table, $numIndexes=false)
{
$objarr =& $this->MetaColumns($table);
- if (!is_array($objarr)) return false;
-
+ if (!is_array($objarr)) {
+ $false = false;
+ return $false;
+ }
$arr = array();
if ($numIndexes) {
$i = 0;
@@ -2021,6 +2149,12 @@
*/
function UnixDate($v)
{
+ if (is_object($v)) {
+ // odbtp support
+ //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
+ return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+ }
+
if (is_numeric($v) && strlen($v) !== 8) return $v;
if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
($v), $rr)) return false;
@@ -2039,6 +2173,12 @@
*/
function UnixTimeStamp($v)
{
+ if (is_object($v)) {
+ // odbtp support
+ //( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
+ return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+ }
+
if (!preg_match(
"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
($v), $rr)) return false;
@@ -2478,7 +2618,8 @@
$cols = $this->_numOfFields;
if ($cols < 2) {
- return false;
+ $false = false;
+ return $false;
}
$numIndex = isset($this->fields[0]);
$results = array();
@@ -2592,14 +2733,7 @@
*/
function UnixDate($v)
{
- if (is_numeric($v) && strlen($v) !== 8) return $v;
- if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|",
- ($v), $rr)) return false;
-
- if ($rr[1] <= TIMESTAMP_FIRST_YEAR || $rr[1] > 10000) return 0;
-
- // h-m-s-MM-DD-YY
- return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+ return ADOConnection::UnixDate($v);
}
@@ -2610,15 +2744,7 @@
*/
function UnixTimeStamp($v)
{
-
- if (!preg_match(
- "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
- ($v), $rr)) return false;
- if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
-
- // h-m-s-MM-DD-YY
- if (!isset($rr[5])) return adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
- return @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+ return ADOConnection::UnixTimeStamp($v);
}
@@ -2656,7 +2782,10 @@
*/
function &FetchRow()
{
- if ($this->EOF) return false;
+ if ($this->EOF) {
+ $false = false;
+ return $false;
+ }
$arr = $this->fields;
$this->_currentRow++;
if (!$this->_fetch()) $this->EOF = true;
@@ -2970,7 +3099,9 @@
}
}
$i = 0;
- $o = &$this->_obj;
+ if (PHP_VERSION >= 5) $o = clone($this->_obj);
+ else $o = $this->_obj;
+
for ($i=0; $i <$this->_numOfFields; $i++) {
$name = $this->_names[$i];
if ($isupper) $n = strtoupper($name);
@@ -2992,7 +3123,7 @@
*/
function &FetchNextObj()
{
- $o = $this->FetchNextObject(false);
+ $o =& $this->FetchNextObject(false);
return $o;
}
@@ -3102,6 +3233,9 @@
'INT IDENTITY' => 'R',
##
'INT' => 'I',
+ 'INT2' => 'I',
+ 'INT4' => 'I',
+ 'INT8' => 'I',
'INTEGER' => 'I',
'INTEGER UNSIGNED' => 'I',
'SHORT' => 'I',
@@ -3142,7 +3276,7 @@
$tmap = false;
$t = strtoupper($t);
- $tmap = @$typeMap[$t];
+ $tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
switch ($tmap) {
case 'C':
@@ -3317,7 +3451,8 @@
/* Use associative array to get fields array */
function Fields($colname)
{
- if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ $mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
+ if ($mode & ADODB_FETCH_ASSOC) {
if (!isset($this->fields[$colname])) $colname = strtolower($colname);
return $this->fields[$colname];
}
@@ -3419,19 +3554,26 @@
if (!$dbType) return false;
$db = strtolower($dbType);
switch ($db) {
+ case 'ado':
+ if (PHP_VERSION >= 5) $db = 'ado5';
+ $class = 'ado';
+ break;
case 'ifx':
- case 'maxsql': $db = 'mysqlt'; break;
+ case 'maxsql': $class = $db = 'mysqlt'; break;
case 'postgres':
- case 'pgsql': $db = 'postgres7'; break;
+ case 'postgres8':
+ case 'pgsql': $class = $db = 'postgres7'; break;
+ default:
+ $class = $db; break;
}
- @include_once(ADODB_DIR."/drivers/adodb-".$db.".inc.php");
- $ADODB_LASTDB = $db;
- $ok = class_exists("ADODB_" . $db);
- if ($ok) return $db;
-
- print_r(get_declared_classes());
$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
+ @include_once($file);
+ $ADODB_LASTDB = $class;
+
+ if (class_exists("ADODB_" . $db)) return $class;
+
+ //ADOConnection::outp(adodb_pr(get_declared_classes(),true));
if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
else ADOConnection::outp("Syntax error in file: $file");
return false;
@@ -3460,7 +3602,7 @@
if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
-
+ $false = false;
if (strpos($db,'://')) {
$origdsn = $db;
$dsna = @parse_url($db);
@@ -3468,11 +3610,11 @@
// special handling of oracle, which might not have host
$db = str_replace('@/','@adodb-fakehost/',$db);
$dsna = parse_url($db);
- if (!$dsna) return false;
+ if (!$dsna) return $false;
$dsna['host'] = '';
}
$db = @$dsna['scheme'];
- if (!$db) return false;
+ if (!$db) return $false;
$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
@@ -3517,13 +3659,13 @@
} else
ADOConnection::outp( "ADONewConnection: Unable to load database driver '$db'
",false);
- return false;
+ return $false;
}
$cls = 'ADODB_'.$db;
if (!class_exists($cls)) {
adodb_backtrace();
- return false;
+ return $false;
}
$obj =& new $cls();
@@ -3551,6 +3693,8 @@
#mysqli
case 'port': $obj->port = $v; break;
case 'socket': $obj->socket = $v; break;
+ #oci8
+ case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
}
}
if (empty($persist))
@@ -3558,7 +3702,7 @@
else
$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
- if (!$ok) return false;
+ if (!$ok) return $false;
}
}
return $obj;
@@ -3569,53 +3713,53 @@
// $perf == true means called by NewPerfMonitor()
function _adodb_getdriver($provider,$drivername,$perf=false)
{
- if ($provider !== 'native' && $provider != 'odbc' && $provider != 'ado')
- $drivername = $provider;
- else {
- if (substr($drivername,0,5) == 'odbc_') $drivername = substr($drivername,5);
- else if (substr($drivername,0,4) == 'ado_') $drivername = substr($drivername,4);
- else
- switch($drivername) {
- case 'oracle': $drivername = 'oci8';break;
- //case 'sybase': $drivername = 'mssql';break;
- case 'access':
- if ($perf) $drivername = '';
- break;
- case 'db2':
- break;
- default:
- $drivername = 'generic';
- break;
- }
+ switch ($provider) {
+ case 'odbtp': if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6);
+ case 'odbc' : if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5);
+ case 'ado' : if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
+ case 'native': break;
+ default:
+ return $provider;
}
+ switch($drivername) {
+ case 'oracle': $drivername = 'oci8'; break;
+ case 'access': if ($perf) $drivername = ''; break;
+ case 'db2' : break;
+ case 'sapdb' : break;
+ default:
+ $drivername = 'generic';
+ break;
+ }
return $drivername;
}
function &NewPerfMonitor(&$conn)
{
+ $false = false;
$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
- if (!$drivername || $drivername == 'generic') return false;
+ if (!$drivername || $drivername == 'generic') return $false;
include_once(ADODB_DIR.'/adodb-perf.inc.php');
@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
$class = "Perf_$drivername";
- if (!class_exists($class)) return false;
+ if (!class_exists($class)) return $false;
$perf =& new $class($conn);
return $perf;
}
- function &NewDataDictionary(&$conn)
+ function &NewDataDictionary(&$conn,$drivername=false)
{
- $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
-
+ $false = false;
+ if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
+
include_once(ADODB_DIR.'/adodb-lib.inc.php');
include_once(ADODB_DIR.'/adodb-datadict.inc.php');
$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
if (!file_exists($path)) {
ADOConnection::outp("Database driver '$path' not available");
- return false;
+ return $false;
}
include_once($path);
$class = "ADODB2_$drivername";
@@ -3635,12 +3779,20 @@
/*
Perform a print_r, with pre tags for better formatting.
*/
- function adodb_pr($var)
+ function adodb_pr($var,$as_string=false)
{
+ if ($as_string) ob_start();
+
if (isset($_SERVER['HTTP_USER_AGENT'])) {
echo " \n";print_r($var);echo " \n";
} else
print_r($var);
+
+ if ($as_string) {
+ $s = ob_get_contents();
+ ob_end_clean();
+ return $s;
+ }
}
/*
diff --git a/lib/adodb/datadict/datadict-access.inc.php b/lib/adodb/datadict/datadict-access.inc.php
index 1ab7b123766..b473226023e 100644
--- a/lib/adodb/datadict/datadict-access.inc.php
+++ b/lib/adodb/datadict/datadict-access.inc.php
@@ -1,7 +1,7 @@
MetaColumns($tablename);
+ if ( empty($cols)) {
+ return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+ }
+
+ // already exists, alter table instead
+ list($lines,$pkey) = $this->_GenFields($flds);
+ $alter = 'ALTER TABLE ' . $this->TableName($tablename);
+ $sql = array();
+
+ foreach ( $lines as $id => $v ) {
+ if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+ /**
+ If the first field of $v is the fieldname, and
+ the second is the field type/size, we assume its an
+ attempt to modify the column size, so check that it is allowed
+ $v can have an indeterminate number of blanks between the
+ fields, so account for that too
+ */
+ $vargs = explode(' ' , $v);
+ // assume that $vargs[0] is the field name.
+ $i=0;
+ // Find the next non-blank value;
+ for ($i=1;$ialterCol . ' ' . $v;
+ } else {
+ $sql[] = $alter . $this->addCol . ' ' . $v;
+ }
+ }
+
+ return $sql;
+ }
+
}
diff --git a/lib/adodb/datadict/datadict-firebird.inc.php b/lib/adodb/datadict/datadict-firebird.inc.php
index e27b0dfab9c..7028a8bc39e 100644
--- a/lib/adodb/datadict/datadict-firebird.inc.php
+++ b/lib/adodb/datadict/datadict-firebird.inc.php
@@ -1,7 +1,7 @@
dropCol $v";
+ $f[] = "\n$this->dropCol ".$this->NameQuote($v);
}
- $s .= implode(',',$f);
+ $s .= implode(', ',$f);
$sql[] = $s;
return $sql;
}
@@ -239,12 +243,9 @@ CREATE TABLE
case 'BIGINT':
return $ftype;
}
- if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
- $ftype .= "(".$fsize;
- if (strlen($fprec)) $ftype .= ",".$fprec;
- $ftype .= ')';
- }
- return $ftype;
+ if ($ty == 'T') return $ftype;
+ return parent::_GetSize($ftype, $ty, $fsize, $fprec);
+
}
}
?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-mysql.inc.php b/lib/adodb/datadict/datadict-mysql.inc.php
index bee8f7c464d..8521f7dcc16 100644
--- a/lib/adodb/datadict/datadict-mysql.inc.php
+++ b/lib/adodb/datadict/datadict-mysql.inc.php
@@ -1,7 +1,7 @@
type;
$len = $fieldobj->max_length;
}
+ $is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
$len = -1; // mysql max_length is not accurate
switch (strtoupper($t)) {
@@ -65,11 +67,11 @@ class ADODB2_mysql extends ADODB_DataDict {
return 'F';
case 'INT':
- case 'INTEGER': return (!empty($fieldobj->primary_key)) ? 'R' : 'I';
- case 'TINYINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I1';
- case 'SMALLINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I2';
- case 'MEDIUMINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I4';
- case 'BIGINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I8';
+ case 'INTEGER': return $is_serial ? 'R' : 'I';
+ case 'TINYINT': return $is_serial ? 'R' : 'I1';
+ case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+ case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+ case 'BIGINT': return $is_serial ? 'R' : 'I8';
default: return 'N';
}
}
@@ -91,10 +93,10 @@ class ADODB2_mysql extends ADODB_DataDict {
case 'L': return 'TINYINT';
case 'R':
+ case 'I4':
case 'I': return 'INTEGER';
case 'I1': return 'TINYINT';
case 'I2': return 'SMALLINT';
- case 'I4': return 'MEDIUMINT';
case 'I8': return 'BIGINT';
case 'F': return 'DOUBLE';
diff --git a/lib/adodb/datadict/datadict-oci8.inc.php b/lib/adodb/datadict/datadict-oci8.inc.php
index 3c9d6694125..de6f7331d89 100644
--- a/lib/adodb/datadict/datadict-oci8.inc.php
+++ b/lib/adodb/datadict/datadict-oci8.inc.php
@@ -1,7 +1,7 @@
$v) $flds[$k] = $this->NameQuote($v);
+
$sql = array();
$s = "ALTER TABLE $tabname DROP(";
- $s .= implode(',',$flds).') CASCADE COSTRAINTS';
+ $s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
$sql[] = $s;
return $sql;
}
diff --git a/lib/adodb/datadict/datadict-postgres.inc.php b/lib/adodb/datadict/datadict-postgres.inc.php
index 525fa83f501..c25123e1beb 100644
--- a/lib/adodb/datadict/datadict-postgres.inc.php
+++ b/lib/adodb/datadict/datadict-postgres.inc.php
@@ -1,7 +1,7 @@
type;
$len = $fieldobj->max_length;
}
+ $is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique &&
+ $fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
+
switch (strtoupper($t)) {
case 'INTERVAL':
case 'CHAR':
@@ -60,12 +64,12 @@ class ADODB2_postgres extends ADODB_DataDict {
case 'TIMESTAMPTZ':
return 'T';
- case 'INTEGER': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I' : 'R';
+ case 'INTEGER': return !$is_serial ? 'I' : 'R';
case 'SMALLINT':
- case 'INT2': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I2' : 'R';
- case 'INT4': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I4' : 'R';
+ case 'INT2': return !$is_serial ? 'I2' : 'R';
+ case 'INT4': return !$is_serial ? 'I4' : 'R';
case 'BIGINT':
- case 'INT8': return (empty($fieldobj->primary_key) && empty($fieldobj->unique))? 'I8' : 'R';
+ case 'INT8': return !$is_serial ? 'I8' : 'R';
case 'OID':
case 'SERIAL':
@@ -111,23 +115,150 @@ class ADODB2_postgres extends ADODB_DataDict {
}
}
- /* The following does not work in Pg 6.0 - does anyone want to contribute code?
-
- //"ALTER TABLE table ALTER COLUMN column SET DEFAULT mydef" and
- //"ALTER TABLE table ALTER COLUMN column DROP DEFAULT mydef"
- //"ALTER TABLE table ALTER COLUMN column SET NOT NULL" and
- //"ALTER TABLE table ALTER COLUMN column DROP NOT NULL"*/
- function AlterColumnSQL($tabname, $flds)
+ /**
+ * Adding a new Column
+ *
+ * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
+ *
+ * @param string $tabname table-name
+ * @param string $flds column-names and types for the changed columns
+ * @return array with SQL strings
+ */
+ function AddColumnSQL($tabname, $flds)
{
- if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported for PostgreSQL");
- return array();
+ $tabname = $this->TableName ($tabname);
+ $sql = array();
+ list($lines,$pkey) = $this->_GenFields($flds);
+ $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+ foreach($lines as $v) {
+ if (($not_null = preg_match('/NOT NULL/i',$v))) {
+ $v = preg_replace('/NOT NULL/i','',$v);
+ }
+ if (preg_match('/^([^ ]+) .*(DEFAULT [^ ]+)/',$v,$matches)) {
+ list(,$colname,$default) = $matches;
+ $sql[] = $alter . str_replace($default,'',$v);
+ $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET ' . $default;
+ } else {
+ $sql[] = $alter . $v;
+ }
+ if ($not_null) {
+ list($colname) = explode(' ',$v);
+ $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
+ }
+ }
+ return $sql;
}
-
- function DropColumnSQL($tabname, $flds)
+ /**
+ * Change the definition of one column
+ *
+ * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
+ * to allow, recreating the table and copying the content over to the new table
+ * @param string $tabname table-name
+ * @param string $flds column-name and type for the changed column
+ * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+ * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+ * @return array with SQL strings
+ */
+ function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
{
- if ($this->debug) ADOConnection::outp("DropColumnSQL only works with PostgreSQL 7.3+");
- return ADODB_DataDict::DropColumnSQL($tabname, $flds)."/* only works for PostgreSQL 7.3+ */";
+ if (!$tableflds) {
+ if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+ return array();
+ }
+ return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+ }
+
+ /**
+ * Drop one column
+ *
+ * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
+ * to allow, recreating the table and copying the content over to the new table
+ * @param string $tabname table-name
+ * @param string $flds column-name and type for the changed column
+ * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+ * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+ * @return array with SQL strings
+ */
+ function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+ {
+ $has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
+ if (!$has_drop_column && !$tableflds) {
+ if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+ return array();
+ }
+ if ($has_drop_column) {
+ return ADODB_DataDict::DropColumnSQL($tabname, $flds);
+ }
+ return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
+ }
+
+ /**
+ * Save the content into a temp. table, drop and recreate the original table and copy the content back in
+ *
+ * We also take care to set the values of the sequenz and recreate the indexes.
+ * All this is done in a transaction, to not loose the content of the table, if something went wrong!
+ * @internal
+ * @param string $tabname table-name
+ * @param string $dropflds column-names to drop
+ * @param string $tableflds complete defintion of the new table, eg. for postgres
+ * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
+ * @return array with SQL strings
+ */
+ function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
+ {
+ if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
+ $copyflds = array();
+ foreach($this->MetaColumns($tabname) as $fld) {
+ if (!$dropflds || !in_array($fld->name,$dropflds)) {
+ // we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
+ if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) &&
+ in_array($fld->type,array('varchar','char','text','bytea'))) {
+ $copyflds[] = "to_number($fld->name,'S99D99')";
+ } else {
+ $copyflds[] = $fld->name;
+ }
+ // identify the sequence name and the fld its on
+ if ($fld->primary_key && $fld->has_default &&
+ preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
+ $seq_name = $matches[1];
+ $seq_fld = $fld->name;
+ }
+ }
+ }
+ $copyflds = implode(', ',$copyflds);
+
+ $tempname = $tabname.'_tmp';
+ $aSql[] = 'BEGIN'; // we use a transaction, to make sure not to loose the content of the table
+ $aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
+ $aSql = array_merge($aSql,$this->DropTableSQL($tabname));
+ $aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
+ $aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
+ if ($seq_name && $seq_fld) { // if we have a sequence we need to set it again
+ $seq_name = $tabname.'_'.$seq_fld.'_seq'; // has to be the name of the new implicit sequence
+ $aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
+ }
+ $aSql[] = "DROP TABLE $tempname";
+ // recreate the indexes, if they not contain one of the droped columns
+ foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
+ {
+ if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
+ $aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
+ $idx_data['unique'] ? array('UNIQUE') : False));
+ }
+ }
+ $aSql[] = 'COMMIT';
+ return $aSql;
+ }
+
+ function DropTableSQL($tabname)
+ {
+ $sql = ADODB_DataDict::DropTableSQL($tabname);
+
+ $drop_seq = $this->_DropAutoIncrement($tabname);
+ if ($drop_seq) $sql[] = $drop_seq;
+
+ return $sql;
}
// return string must begin with space
@@ -144,9 +275,20 @@ class ADODB2_postgres extends ADODB_DataDict {
return $suffix;
}
- function _DropAutoIncrement($t)
+ // search for a sequece for the given table (asumes the seqence-name contains the table-name!)
+ // if yes return sql to drop it
+ // this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
+ function _DropAutoIncrement($tabname)
{
- return "drop sequence ".$t."_m_id_seq";
+ $tabname = $this->connection->quote('%'.$tabname.'%');
+
+ $seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
+
+ // check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
+ if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
+ return False;
+ }
+ return "DROP SEQUENCE ".$seq;
}
/*
diff --git a/lib/adodb/datadict/datadict-sapdb.inc.php b/lib/adodb/datadict/datadict-sapdb.inc.php
new file mode 100644
index 00000000000..7f6b5ee048f
--- /dev/null
+++ b/lib/adodb/datadict/datadict-sapdb.inc.php
@@ -0,0 +1,121 @@
+type;
+ $len = $fieldobj->max_length;
+ }
+ static $maxdb_type2adodb = array(
+ 'VARCHAR' => 'C',
+ 'CHARACTER' => 'C',
+ 'LONG' => 'X', // no way to differ between 'X' and 'B' :-(
+ 'DATE' => 'D',
+ 'TIMESTAMP' => 'T',
+ 'BOOLEAN' => 'L',
+ 'INTEGER' => 'I4',
+ 'SMALLINT' => 'I2',
+ 'FLOAT' => 'F',
+ 'FIXED' => 'N',
+ );
+ $type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C';
+
+ // convert integer-types simulated with fixed back to integer
+ if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) {
+ $type = $len == 20 ? 'I8' : 'I1';
+ }
+ if ($fieldobj->auto_increment) $type = 'R';
+
+ return $type;
+ }
+
+ // return string must begin with space
+ function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+ {
+ $suffix = '';
+ if ($funsigned) $suffix .= ' UNSIGNED';
+ if ($fnotnull) $suffix .= ' NOT NULL';
+ if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
+ elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+ if ($fconstraint) $suffix .= ' '.$fconstraint;
+ return $suffix;
+ }
+
+ function AddColumnSQL($tabname, $flds)
+ {
+ $tabname = $this->TableName ($tabname);
+ $sql = array();
+ list($lines,$pkey) = $this->_GenFields($flds);
+ return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
+ }
+
+ function AlterColumnSQL($tabname, $flds)
+ {
+ $tabname = $this->TableName ($tabname);
+ $sql = array();
+ list($lines,$pkey) = $this->_GenFields($flds);
+ return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
+ }
+
+ function DropColumnSQL($tabname, $flds)
+ {
+ $tabname = $this->TableName ($tabname);
+ if (!is_array($flds)) $flds = explode(',',$flds);
+ foreach($flds as $k => $v) {
+ $flds[$k] = $this->NameQuote($v);
+ }
+ return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/lib/adodb/datadict/datadict-sybase.inc.php b/lib/adodb/datadict/datadict-sybase.inc.php
index 592d42b355d..53ea991c9b7 100644
--- a/lib/adodb/datadict/datadict-sybase.inc.php
+++ b/lib/adodb/datadict/datadict-sybase.inc.php
@@ -1,7 +1,7 @@
TableName ($tabname);
+ $tabname = $this->TableName($tabname);
if (!is_array($flds)) $flds = explode(',',$flds);
$f = array();
$s = "ALTER TABLE $tabname";
foreach($flds as $v) {
- $f[] = "\n$this->dropCol $v";
+ $f[] = "\n$this->dropCol ".$this->NameQuote($v);
}
- $s .= implode(',',$f);
+ $s .= implode(', ',$f);
$sql[] = $s;
return $sql;
}
diff --git a/lib/adodb/drivers/adodb-access.inc.php b/lib/adodb/drivers/adodb-access.inc.php
index 53a267853d2..d9be94d7289 100644
--- a/lib/adodb/drivers/adodb-access.inc.php
+++ b/lib/adodb/drivers/adodb-access.inc.php
@@ -1,6 +1,6 @@
debug) ADOConnection::outp( "Host=".$argHostname."",$t,' ';var_dump($f->value); echo '
';
+ switch($t) {
+ case 135: // timestamp
+ if (!strlen((string)$f->value)) $this->fields[] = false;
+ else {
+ if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+ else $val = $f->value;
+ $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ }
+ break;
+ case 133:// A date value (yyyymmdd)
+ if ($val = $f->value) {
+ $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+ } else
+ $this->fields[] = false;
+ break;
+ case 7: // adDate
+ if (!strlen((string)$f->value)) $this->fields[] = false;
+ else {
+ if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+ else $val = $f->value;
+
+ if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+ else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ }
+ break;
+ case 1: // null
+ $this->fields[] = false;
+ break;
+ case 6: // currency is not supported properly;
+ ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP ');
+ $this->fields[] = (float) $f->value;
+ break;
+ default:
+ $this->fields[] = $f->value;
+ break;
+ }
+ //print " $f->value $t, ";
+ $f = next($this->_flds);
+ $t = next($this->_tarr);
+ } // for
+ if ($this->hideErrors) error_reporting($olde);
+ @$rs->MoveNext(); // @ needed for some versions of PHP!
+
+ if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+ $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+ }
+ return true;
+ }
+
+ function NextRecordSet()
+ {
+ $rs = $this->_queryID;
+ $this->_queryID = $rs->NextRecordSet();
+ //$this->_queryID = $this->_QueryId->NextRecordSet();
+ if ($this->_queryID == null) return false;
+
+ $this->_currentRow = -1;
+ $this->_currentPage = -1;
+ $this->bind = false;
+ $this->fields = false;
+ $this->_flds = false;
+ $this->_tarr = false;
+
+ $this->_inited = false;
+ $this->Init();
+ return true;
+ }
+
+ function _close() {
+ $this->_flds = false;
+ @$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
+ $this->_queryID = false;
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/lib/adodb/drivers/adodb-ado_access.inc.php b/lib/adodb/drivers/adodb-ado_access.inc.php
index 72ff6deebe6..f8f4ab75dcd 100644
--- a/lib/adodb/drivers/adodb-ado_access.inc.php
+++ b/lib/adodb/drivers/adodb-ado_access.inc.php
@@ -1,6 +1,6 @@
= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+ else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
}
class ADODB_ado_access extends ADODB_ado {
@@ -33,6 +34,10 @@ class ADODB_ado_access extends ADODB_ado {
}
function BeginTrans() { return false;}
+
+ function CommitTrans() { return false;}
+
+ function RollbackTrans() { return false;}
}
diff --git a/lib/adodb/drivers/adodb-ado_mssql.inc.php b/lib/adodb/drivers/adodb-ado_mssql.inc.php
index 28a31495838..64aeeea12f4 100644
--- a/lib/adodb/drivers/adodb-ado_mssql.inc.php
+++ b/lib/adodb/drivers/adodb-ado_mssql.inc.php
@@ -1,6 +1,6 @@
= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+ else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
}
@@ -54,35 +55,36 @@ class ADODB_ado_mssql extends ADODB_ado {
function MetaColumns($table)
{
- $table = strtoupper($table);
- $arr= array();
- $dbc = $this->_connectionID;
-
- $osoptions = array();
- $osoptions[0] = null;
- $osoptions[1] = null;
- $osoptions[2] = $table;
- $osoptions[3] = null;
-
- $adors=@$dbc->OpenSchema(4, $osoptions);//tables
+ $table = strtoupper($table);
+ $arr= array();
+ $dbc = $this->_connectionID;
+
+ $osoptions = array();
+ $osoptions[0] = null;
+ $osoptions[1] = null;
+ $osoptions[2] = $table;
+ $osoptions[3] = null;
+
+ $adors=@$dbc->OpenSchema(4, $osoptions);//tables
+
+ if ($adors){
+ while (!$adors->EOF){
+ $fld = new ADOFieldObject();
+ $c = $adors->Fields(3);
+ $fld->name = $c->Value;
+ $fld->type = 'CHAR'; // cannot discover type in ADO!
+ $fld->max_length = -1;
+ $arr[strtoupper($fld->name)]=$fld;
+
+ $adors->MoveNext();
+ }
+ $adors->Close();
+ }
+ $false = false;
+ return empty($arr) ? $false : $arr;
+ }
- if ($adors){
- while (!$adors->EOF){
- $fld = new ADOFieldObject();
- $c = $adors->Fields(3);
- $fld->name = $c->Value;
- $fld->type = 'CHAR'; // cannot discover type in ADO!
- $fld->max_length = -1;
- $arr[strtoupper($fld->name)]=$fld;
-
- $adors->MoveNext();
- }
- $adors->Close();
- }
-
- return $arr;
- }
- }
+ } // end class
class ADORecordSet_ado_mssql extends ADORecordSet_ado {
diff --git a/lib/adodb/drivers/adodb-borland_ibase.inc.php b/lib/adodb/drivers/adodb-borland_ibase.inc.php
index 3d71ac6819b..3c65235d0f5 100644
--- a/lib/adodb/drivers/adodb-borland_ibase.inc.php
+++ b/lib/adodb/drivers/adodb-borland_ibase.inc.php
@@ -1,6 +1,6 @@
_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
+ $url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
- "&offset=$offset";
+ "&offset=$offset";
$err = false;
$rs = csv2rs($url,$err,false);
- if ($this->debug) print "$url$err $err $err $err --- Error in type matching $t -----
";
+ return 'N';
+ }
+ } // function
-}
+} // rs class
}
diff --git a/lib/adodb/drivers/adodb-mysqlt.inc.php b/lib/adodb/drivers/adodb-mysqlt.inc.php
index f7e2bfdd273..6c31418d811 100644
--- a/lib/adodb/drivers/adodb-mysqlt.inc.php
+++ b/lib/adodb/drivers/adodb-mysqlt.inc.php
@@ -1,7 +1,7 @@
fetchMode = MYSQL_NUM; break;
case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
- default:
+
case ADODB_FETCH_DEFAULT:
- case ADODB_FETCH_BOTH:$this->fetchMode = MYSQL_BOTH; break;
+ case ADODB_FETCH_BOTH:
+ default: $this->fetchMode = MYSQL_BOTH; break;
}
+ $this->adodbFetchMode = $mode;
$this->ADORecordSet($queryID);
}
@@ -108,9 +110,11 @@ class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {
{
case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
- default:
+
case ADODB_FETCH_DEFAULT:
- case ADODB_FETCH_BOTH:$this->fetchMode = MYSQL_BOTH; break;
+ case ADODB_FETCH_BOTH:
+ default:
+ $this->fetchMode = MYSQL_BOTH; break;
}
$this->ADORecordSet($queryID);
diff --git a/lib/adodb/drivers/adodb-netezza.inc.php b/lib/adodb/drivers/adodb-netezza.inc.php
index 8c2867f4046..1bd7906183e 100644
--- a/lib/adodb/drivers/adodb-netezza.inc.php
+++ b/lib/adodb/drivers/adodb-netezza.inc.php
@@ -1,6 +1,6 @@
fetchMode = PGSQL_NUM; break;
case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
- default:
+
case ADODB_FETCH_DEFAULT:
- case ADODB_FETCH_BOTH:$this->fetchMode = PGSQL_BOTH; break;
+ case ADODB_FETCH_BOTH:
+ default: $this->fetchMode = PGSQL_BOTH; break;
}
+ $this->adodbFetchMode = $mode;
$this->ADORecordSet($queryID);
}
diff --git a/lib/adodb/drivers/adodb-oci8.inc.php b/lib/adodb/drivers/adodb-oci8.inc.php
index ded925cd4a9..f1f913c408b 100644
--- a/lib/adodb/drivers/adodb-oci8.inc.php
+++ b/lib/adodb/drivers/adodb-oci8.inc.php
@@ -1,7 +1,7 @@
fetchMode !== false) $savem = $this->SetFetchMode(false);
@@ -107,7 +108,9 @@ class ADODB_oci8 extends ADOConnection {
if (isset($savem)) $this->SetFetchMode($savem);
$ADODB_FETCH_MODE = $save;
- if (!$rs) return false;
+ if (!$rs) {
+ return $false;
+ }
$retarr = array();
while (!$rs->EOF) { //print_r($rs->fields);
$fld = new ADOFieldObject();
@@ -128,7 +131,7 @@ class ADODB_oci8 extends ADOConnection {
$rs->MoveNext();
}
$rs->Close();
- return $retarr;
+ return (empty($retarr)) ? $false : $retarr;
}
function Time()
@@ -203,12 +206,23 @@ NATSOFT.DOMAIN =
//if ($argHostname) print "Connect: 1st argument should be left blank for $this->databaseType
";
if ($mode==1) {
- $this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
+ $this->_connectionID = ($this->charSet) ?
+ OCIPLogon($argUsername,$argPassword, $argDatabasename)
+ :
+ OCIPLogon($argUsername,$argPassword, $argDatabasename, $this->charSet)
+ ;
if ($this->_connectionID && $this->autoRollback) OCIrollback($this->_connectionID);
} else if ($mode==2) {
- $this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
+ $this->_connectionID = ($this->charSet) ?
+ OCINLogon($argUsername,$argPassword, $argDatabasename)
+ :
+ OCINLogon($argUsername,$argPassword, $argDatabasename, $this->charSet);
+
} else {
- $this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
+ $this->_connectionID = ($this->charSet) ?
+ OCILogon($argUsername,$argPassword, $argDatabasename)
+ :
+ OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet);
}
if ($this->_connectionID === false) return false;
if ($this->_initdate) {
@@ -291,6 +305,73 @@ NATSOFT.DOMAIN =
return $ret;
}
+ // Mark Newnham
+ function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+ {
+ // save old fetch mode
+ global $ADODB_FETCH_MODE;
+
+ $save = $ADODB_FETCH_MODE;
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+ if ($this->fetchMode !== FALSE) {
+ $savem = $this->SetFetchMode(FALSE);
+ }
+
+ // get index details
+ $table = strtoupper($table);
+
+ // get Primary index
+ $primary_key = '';
+
+ $false = false;
+ $rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
+ if ($row = $rs->FetchRow())
+ $primary_key = $row[1]; //constraint_name
+
+ if ($primary==TRUE && $primary_key=='') {
+ if (isset($savem))
+ $this->SetFetchMode($savem);
+ $ADODB_FETCH_MODE = $save;
+ return $false; //There is no primary key
+ }
+
+ $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+
+
+ if (!is_object($rs)) {
+ if (isset($savem))
+ $this->SetFetchMode($savem);
+ $ADODB_FETCH_MODE = $save;
+ return $false;
+ }
+
+ $indexes = array ();
+ // parse index data into array
+
+ while ($row = $rs->FetchRow()) {
+ if ($primary && $row[0] != $primary_key) continue;
+ if (!isset($indexes[$row[0]])) {
+ $indexes[$row[0]] = array(
+ 'unique' => ($row[1] == 'UNIQUE'),
+ 'columns' => array()
+ );
+ }
+ $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+ }
+
+ // sort columns by order in the index
+ foreach ( array_keys ($indexes) as $index ) {
+ ksort ($indexes[$index]['columns']);
+ }
+
+ if (isset($savem)) {
+ $this->SetFetchMode($savem);
+ $ADODB_FETCH_MODE = $save;
+ }
+ return $indexes;
+ }
+
function BeginTrans()
{
if ($this->transOff) return true;
@@ -457,9 +538,9 @@ NATSOFT.DOMAIN =
if ($offset > 0) $nrows += $offset;
//$inputarr['adodb_rownum'] = $nrows;
if ($this->databaseType == 'oci8po') {
- $sql = "select * from ($sql) where rownum <= ?";
+ $sql = "select * from (".$sql.") where rownum <= ?";
} else {
- $sql = "select * from ($sql) where rownum <= :adodb_offset";
+ $sql = "select * from (".$sql.") where rownum <= :adodb_offset";
}
$inputarr['adodb_offset'] = $nrows;
$nrows = -1;
@@ -473,10 +554,13 @@ NATSOFT.DOMAIN =
// Algorithm by Tomas V V Cox, from PEAR DB oci8.php
// Let Oracle return the name of the columns
- $q_fields = "SELECT * FROM ($sql) WHERE NULL = NULL";
- if (!$stmt = OCIParse($this->_connectionID, $q_fields)) {
- return false;
- }
+ $q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
+
+ $false = false;
+ if (! $stmt_arr = $this->Prepare($q_fields)) {
+ return $false;
+ }
+ $stmt = $stmt_arr[1];
if (is_array($inputarr)) {
foreach($inputarr as $k => $v) {
@@ -499,7 +583,7 @@ NATSOFT.DOMAIN =
if (!OCIExecute($stmt, OCI_DEFAULT)) {
OCIFreeStatement($stmt);
- return false;
+ return $false;
}
$ncols = OCINumCols($stmt);
@@ -575,7 +659,7 @@ NATSOFT.DOMAIN =
if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
$commit = $this->autoCommit;
if ($commit) $this->BeginTrans();
- $rs = $this->_Execute($sql,$arr);
+ $rs = $this->Execute($sql,$arr);
if ($rez = !empty($rs)) $desc->save($val);
$desc->free();
if ($commit) $this->CommitTrans();
@@ -630,16 +714,15 @@ NATSOFT.DOMAIN =
$BINDNUM += 1;
- if (@OCIStatementType($stmt) == 'BEGIN') {
+ $sttype = @OCIStatementType($stmt);
+ if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
- }
-
+ }
return array($sql,$stmt,0,$BINDNUM);
}
/*
- Call an oracle stored procedure and return a cursor variable.
- Convert the cursor variable into a recordset.
+ Call an oracle stored procedure and returns a cursor variable as a recordset.
Concept by Robert Tuttle robert@ud.com
Example:
@@ -654,17 +737,24 @@ NATSOFT.DOMAIN =
*/
function &ExecuteCursor($sql,$cursorName='rs',$params=false)
{
- $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
-
+ if (is_array($sql)) $stmt = $sql;
+ else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
+
if (is_array($stmt) && sizeof($stmt) >= 5) {
+ $hasref = true;
$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
if ($params) {
foreach($params as $k => $v) {
$this->Parameter($stmt,$params[$k], $k);
}
}
- }
- return $this->Execute($stmt);
+ } else
+ $hasref = false;
+
+ $rs =& $this->Execute($stmt);
+ if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
+ else if ($hasref) $rs->_refcursor = $stmt[4];
+ return $rs;
}
/*
@@ -715,25 +805,26 @@ NATSOFT.DOMAIN =
ADOConnection::outp("Bind : name = $name");
}
//we have to create a new Descriptor here
- $numlob = count($this -> _refLOBs);
- $this -> _refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
- $this -> _refLOBs[$numlob]['TYPE'] = $isOutput;
+ $numlob = count($this->_refLOBs);
+ $this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
+ $this->_refLOBs[$numlob]['TYPE'] = $isOutput;
- $tmp = &$this -> _refLOBs[$numlob]['LOB'];
+ $tmp = &$this->_refLOBs[$numlob]['LOB'];
$rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
if ($this->debug) {
- ADOConnection::outp("Bind : descriptor has been allocated, var binded");
+ ADOConnection::outp("Bind : descriptor has been allocated, var (".$name.") binded");
}
// if type is input then write data to lob now
if ($isOutput == false) {
- $var = $this -> BlobEncode($var);
- $tmp -> WriteTemporary($var);
+ $var = $this->BlobEncode($var);
+ $tmp->WriteTemporary($var);
+ $this->_refLOBs[$numlob]['VAR'] = &$var;
if ($this->debug) {
ADOConnection::outp("Bind : LOB has been written to temp");
}
} else {
- $this -> _refLOBs[$numlob]['VAR'] = &$var;
+ $this->_refLOBs[$numlob]['VAR'] = &$var;
}
$rez = $tmp;
} else {
@@ -790,7 +881,7 @@ NATSOFT.DOMAIN =
3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
- $db->$bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
+ $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3);
$db->execute($stmt);
*/
function _query($sql,$inputarr)
@@ -811,7 +902,7 @@ NATSOFT.DOMAIN =
$bindarr = array();
foreach($inputarr as $k => $v) {
$bindarr[$k] = $v;
- OCIBindByName($stmt,":$k",$bindarr[$k],4000);
+ OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
}
$this->_bind[$bindpos] = &$bindarr;
}
@@ -833,7 +924,7 @@ NATSOFT.DOMAIN =
else
OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
- if ($this->debug==99) echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'OUT LOB : LOB has been loaded. OUT LOB : LOB has been loaded. IN LOB : LOB has been saved. |
+// +----------------------------------------------------------------------+
+//
+// $Id$
+//
+
+require_once 'Auth/Container.php';
+require_once 'adodb.inc.php';
+require_once 'adodb-pear.inc.php';
+require_once 'adodb-errorpear.inc.php';
+
+/**
+ * Storage driver for fetching login data from a database using ADOdb-PHP.
+ *
+ * This storage driver can use all databases which are supported
+ * by the ADBdb DB abstraction layer to fetch login data.
+ * See http://php.weblogs.com/adodb for information on ADOdb.
+ * NOTE: The ADOdb directory MUST be in your PHP include_path!
+ *
+ * @author Richard Tango-Lowy
+ * @package Auth
+ * @version $Revision$
+ */
+class Auth_Container_ADOdb extends Auth_Container
+{
+
+ /**
+ * Additional options for the storage container
+ * @var array
+ */
+ var $options = array();
+
+ /**
+ * DB object
+ * @var object
+ */
+ var $db = null;
+ var $dsn = '';
+
+ /**
+ * User that is currently selected from the DB.
+ * @var string
+ */
+ var $activeUser = '';
+
+ // {{{ Constructor
+
+ /**
+ * Constructor of the container class
+ *
+ * Initate connection to the database via PEAR::ADOdb
+ *
+ * @param string Connection data or DB object
+ * @return object Returns an error object if something went wrong
+ */
+ function Auth_Container_ADOdb($dsn)
+ {
+ $this->_setDefaults();
+
+ if (is_array($dsn)) {
+ $this->_parseOptions($dsn);
+
+ if (empty($this->options['dsn'])) {
+ PEAR::raiseError('No connection parameters specified!');
+ }
+ } else {
+ // Extract db_type from dsn string.
+ $this->options['dsn'] = $dsn;
+ }
+ }
+
+ // }}}
+ // {{{ _connect()
+
+ /**
+ * Connect to database by using the given DSN string
+ *
+ * @access private
+ * @param string DSN string
+ * @return mixed Object on error, otherwise bool
+ */
+ function _connect($dsn)
+ {
+ if (is_string($dsn) || is_array($dsn)) {
+ if(!$this->db) {
+ $this->db = &ADONewConnection($dsn);
+ if( $err = ADODB_Pear_error() ) {
+ return PEAR::raiseError($err);
+ }
+ }
+
+ } else {
+ return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
+ 41,
+ PEAR_ERROR_RETURN,
+ null,
+ null
+ );
+ }
+
+ if(!$this->db) {
+ return PEAR::raiseError(ADODB_Pear_error());
+ } else {
+ return true;
+ }
+ }
+
+ // }}}
+ // {{{ _prepare()
+
+ /**
+ * Prepare database connection
+ *
+ * This function checks if we have already opened a connection to
+ * the database. If that's not the case, a new connection is opened.
+ *
+ * @access private
+ * @return mixed True or a DB error object.
+ */
+ function _prepare()
+ {
+ if(!$this->db) {
+ $res = $this->_connect($this->options['dsn']);
+ }
+ return true;
+ }
+
+ // }}}
+ // {{{ query()
+
+ /**
+ * Prepare query to the database
+ *
+ * This function checks if we have already opened a connection to
+ * the database. If that's not the case, a new connection is opened.
+ * After that the query is passed to the database.
+ *
+ * @access public
+ * @param string Query string
+ * @return mixed a DB_result object or DB_OK on success, a DB
+ * or PEAR error on failure
+ */
+ function query($query)
+ {
+ $err = $this->_prepare();
+ if ($err !== true) {
+ return $err;
+ }
+ return $this->db->query($query);
+ }
+
+ // }}}
+ // {{{ _setDefaults()
+
+ /**
+ * Set some default options
+ *
+ * @access private
+ * @return void
+ */
+ function _setDefaults()
+ {
+ $this->options['db_type'] = 'mysql';
+ $this->options['table'] = 'auth';
+ $this->options['usernamecol'] = 'username';
+ $this->options['passwordcol'] = 'password';
+ $this->options['dsn'] = '';
+ $this->options['db_fields'] = '';
+ $this->options['cryptType'] = 'md5';
+ }
+
+ // }}}
+ // {{{ _parseOptions()
+
+ /**
+ * Parse options passed to the container class
+ *
+ * @access private
+ * @param array
+ */
+ function _parseOptions($array)
+ {
+ foreach ($array as $key => $value) {
+ if (isset($this->options[$key])) {
+ $this->options[$key] = $value;
+ }
+ }
+
+ /* Include additional fields if they exist */
+ if(!empty($this->options['db_fields'])){
+ if(is_array($this->options['db_fields'])){
+ $this->options['db_fields'] = join($this->options['db_fields'], ', ');
+ }
+ $this->options['db_fields'] = ', '.$this->options['db_fields'];
+ }
+ }
+
+ // }}}
+ // {{{ fetchData()
+
+ /**
+ * Get user information from database
+ *
+ * This function uses the given username to fetch
+ * the corresponding login data from the database
+ * table. If an account that matches the passed username
+ * and password is found, the function returns true.
+ * Otherwise it returns false.
+ *
+ * @param string Username
+ * @param string Password
+ * @return mixed Error object or boolean
+ */
+ function fetchData($username, $password)
+ {
+ // Prepare for a database query
+ $err = $this->_prepare();
+ if ($err !== true) {
+ return PEAR::raiseError($err->getMessage(), $err->getCode());
+ }
+
+ // Find if db_fields contains a *, i so assume all col are selected
+ if(strstr($this->options['db_fields'], '*')){
+ $sql_from = "*";
+ }
+ else{
+ $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+ }
+
+ $query = "SELECT ".$sql_from.
+ " FROM ".$this->options['table'].
+ " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
+
+ $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ $rset = $this->db->Execute( $query );
+ $res = $rset->fetchRow();
+
+ if (DB::isError($res)) {
+ return PEAR::raiseError($res->getMessage(), $res->getCode());
+ }
+ if (!is_array($res)) {
+ $this->activeUser = '';
+ return false;
+ }
+ if ($this->verifyPassword(trim($password, "\r\n"),
+ trim($res[$this->options['passwordcol']], "\r\n"),
+ $this->options['cryptType'])) {
+ // Store additional field values in the session
+ foreach ($res as $key => $value) {
+ if ($key == $this->options['passwordcol'] ||
+ $key == $this->options['usernamecol']) {
+ continue;
+ }
+ // Use reference to the auth object if exists
+ // This is because the auth session variable can change so a static call to setAuthData does not make sence
+ if(is_object($this->_auth_obj)){
+ $this->_auth_obj->setAuthData($key, $value);
+ } else {
+ Auth::setAuthData($key, $value);
+ }
+ }
+
+ return true;
+ }
+
+ $this->activeUser = $res[$this->options['usernamecol']];
+ return false;
+ }
+
+ // }}}
+ // {{{ listUsers()
+
+ function listUsers()
+ {
+ $err = $this->_prepare();
+ if ($err !== true) {
+ return PEAR::raiseError($err->getMessage(), $err->getCode());
+ }
+
+ $retVal = array();
+
+ // Find if db_fileds contains a *, i so assume all col are selected
+ if(strstr($this->options['db_fields'], '*')){
+ $sql_from = "*";
+ }
+ else{
+ $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+ }
+
+ $query = sprintf("SELECT %s FROM %s",
+ $sql_from,
+ $this->options['table']
+ );
+ $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
+
+ if (DB::isError($res)) {
+ return PEAR::raiseError($res->getMessage(), $res->getCode());
+ } else {
+ foreach ($res as $user) {
+ $user['username'] = $user[$this->options['usernamecol']];
+ $retVal[] = $user;
+ }
+ }
+ return $retVal;
+ }
+
+ // }}}
+ // {{{ addUser()
+
+ /**
+ * Add user to the storage container
+ *
+ * @access public
+ * @param string Username
+ * @param string Password
+ * @param mixed Additional information that are stored in the DB
+ *
+ * @return mixed True on success, otherwise error object
+ */
+ function addUser($username, $password, $additional = "")
+ {
+ if (function_exists($this->options['cryptType'])) {
+ $cryptFunction = $this->options['cryptType'];
+ } else {
+ $cryptFunction = 'md5';
+ }
+
+ $additional_key = '';
+ $additional_value = '';
+
+ if (is_array($additional)) {
+ foreach ($additional as $key => $value) {
+ $additional_key .= ', ' . $key;
+ $additional_value .= ", '" . $value . "'";
+ }
+ }
+
+ $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
+ $this->options['table'],
+ $this->options['usernamecol'],
+ $this->options['passwordcol'],
+ $additional_key,
+ $username,
+ $cryptFunction($password),
+ $additional_value
+ );
+
+ $res = $this->query($query);
+
+ if (DB::isError($res)) {
+ return PEAR::raiseError($res->getMessage(), $res->getCode());
+ } else {
+ return true;
+ }
+ }
+
+ // }}}
+ // {{{ removeUser()
+
+ /**
+ * Remove user from the storage container
+ *
+ * @access public
+ * @param string Username
+ *
+ * @return mixed True on success, otherwise error object
+ */
+ function removeUser($username)
+ {
+ $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
+ $this->options['table'],
+ $this->options['usernamecol'],
+ $username
+ );
+
+ $res = $this->query($query);
+
+ if (DB::isError($res)) {
+ return PEAR::raiseError($res->getMessage(), $res->getCode());
+ } else {
+ return true;
+ }
+ }
+
+ // }}}
+}
+
+function showDbg( $string ) {
+ print "$string
";
+}
+function dump( $var, $str, $vardump = false ) {
+ print "$str ";
+ ( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
+ print " ";
+}
+?>
diff --git a/lib/adodb/pear/readme.Auth.txt b/lib/adodb/pear/readme.Auth.txt
new file mode 100644
index 00000000000..db283197614
--- /dev/null
+++ b/lib/adodb/pear/readme.Auth.txt
@@ -0,0 +1,20 @@
+From: Rich Tango-Lowy (richtl#arscognita.com)
+Date: Sat, May 29, 2004 11:20 am
+
+OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's
+a bit of a mess, but all the methods work.
+
+Copy ADOdb.php to your pear/Auth/Container/ directory.
+
+Use the ADOdb container exactly as you would the DB
+container, but specify 'ADOdb' instead of 'DB':
+
+$dsn = "mysql://myuser:mypass@localhost/authdb";
+$a = new Auth("ADOdb", $dsn, "loginFunction");
+
+
+-------------------
+
+John Lim adds:
+
+See http://pear.php.net/manual/en/package.authentication.php
diff --git a/lib/adodb/perf/perf-db2.inc.php b/lib/adodb/perf/perf-db2.inc.php
index 0e65e74aa1b..f08e101bb96 100644
--- a/lib/adodb/perf/perf-db2.inc.php
+++ b/lib/adodb/perf/perf-db2.inc.php
@@ -1,6 +1,6 @@
fields[0].'::'.$rs->fields[1]) {
if ($check) {
$carr = explode('::',$check);
- $prefix = "';
+ $prefix = " ';
$suffix = ' ';
if (strlen($prefix)>2000) {
$prefix = '';
@@ -351,7 +351,7 @@ select a.size_for_estimate as cache_mb_estimate,
$rs->Close();
$carr = explode('::',$check);
- $prefix = "';
+ $prefix = " ';
$suffix = ' ';
if (strlen($prefix)>2000) {
$prefix = '';
diff --git a/lib/adodb/perf/perf-postgres.inc.php b/lib/adodb/perf/perf-postgres.inc.php
index 94785b3a968..68bba94aa44 100644
--- a/lib/adodb/perf/perf-postgres.inc.php
+++ b/lib/adodb/perf/perf-postgres.inc.php
@@ -1,7 +1,7 @@
databaseType,'access') !== false;
+ // note - vfp still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
//$hidecnt = false;
@@ -47,20 +49,39 @@
$sel = "$rowfields, ";
if (is_array($colfield)) {
foreach ($colfield as $k => $v) {
- if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
- if ($aggfield)
- $sel .= "\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
+ $k = trim($k);
+ if (!$hidecnt) {
+ $sel .= $iif ?
+ "\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
+ :
+ "\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
+ }
+ if ($aggfield) {
+ $sel .= $iif ?
+ "\n\t$aggfn(IIF($v,$aggfield,0)) AS \"$sumlabel$k\", "
+ :
+ "\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
+ }
}
} else {
foreach ($colarr as $v) {
if (!is_numeric($v)) $vq = $db->qstr($v);
else $vq = $v;
+ $v = trim($v);
if (strlen($v) == 0 ) $v = 'null';
- if (!$hidecnt) $sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
+ if (!$hidecnt) {
+ $sel .= $iif ?
+ "\n\t$aggfn(IIF($colfield=$vq,1,0)) AS \"$v\", "
+ :
+ "\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
+ }
if ($aggfield) {
if ($hidecnt) $label = $v;
else $label = "{$v}_$aggfield";
- $sel .= "\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
+ $sel .= $iif ?
+ "\n\t$aggfn(IIF($colfield=$vq,$aggfield,0)) AS \"$label\", "
+ :
+ "\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
}
}
}
@@ -123,7 +144,7 @@ GROUP BY CompanyName,QuantityPerUnit
#
# Query the main "product" table
# Set the rows to CompanyName and QuantityPerUnit
-# and the columns to the UnitsInStock for different ranges
+# and the columns to the UnitsInStock for diiferent ranges
# and define the joins to link to lookup tables
# "categories" and "suppliers"
#
diff --git a/lib/adodb/readme.txt b/lib/adodb/readme.txt
index cca9c96b165..97bdd9eab41 100644
--- a/lib/adodb/readme.txt
+++ b/lib/adodb/readme.txt
@@ -1,6 +1,6 @@
>> ADODB Library for PHP4
-(c) 2000-2002 John Lim (jlim@natsoft.com.my)
+(c) 2000-2004 John Lim (jlim@natsoft.com.my)
Released under both BSD and GNU Lesser GPL library license.
This means you can use it in proprietary products.
@@ -50,6 +50,8 @@ tute.htm is the tutorial.
>> More Info
For more information, including installation see readme.htm
+or visit
+ http://adodb.sourceforge.net/
>> Feature Requests and Bug Reports
diff --git a/lib/adodb/rsfilter.inc.php b/lib/adodb/rsfilter.inc.php
index c4b5ad04ad7..7f856cd8203 100644
--- a/lib/adodb/rsfilter.inc.php
+++ b/lib/adodb/rsfilter.inc.php
@@ -1,6 +1,6 @@
RecordCount();
for ($i=0; $i < $rows; $i++) {
- $fn($rs->_array[$i],$rs);
+ if (is_array ($fn)) {
+ $obj = $fn[0];
+ $method = $fn[1];
+ $obj->$method ($rs->_array[$i],$rs);
+ } else {
+ $fn($rs->_array[$i],$rs);
+ }
+
}
if (!$rs->EOF) {
$rs->_currentRow = 0;
diff --git a/lib/adodb/server.php b/lib/adodb/server.php
index 04ffb00088b..108e0929ee7 100644
--- a/lib/adodb/server.php
+++ b/lib/adodb/server.php
@@ -1,7 +1,7 @@
debug = true;
@@ -451,7 +471,12 @@ class ADODB_Session {
}
if ($persist) {
- $ok = $conn->PConnect($host, $user, $password, $database);
+ switch($persist) {
+ default:
+ case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+ case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+ case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+ }
} else {
$ok = $conn->Connect($host, $user, $password, $database);
}
@@ -546,7 +571,6 @@ class ADODB_Session {
$expiry = time() + $lifetime;
- $qkey = $conn->quote($key);
$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
// crc32 optimization since adodb 2.1
@@ -555,8 +579,8 @@ class ADODB_Session {
if ($debug) {
echo 'Session: Only updating date - crc32 not changed
';
}
- $sql = "UPDATE $table SET expiry = $expiry WHERE $binary sesskey = $qkey AND expiry >= " . time();
- $rs =& $conn->Execute($sql);
+ $sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
+ $rs =& $conn->Execute($sql,array($expiry,$key,time()));
ADODB_Session::_dumprs($rs);
if ($rs) {
$rs->Close();
diff --git a/lib/adodb/tests/benchmark.php b/lib/adodb/tests/benchmark.php
index f9ccd329d10..05813759277 100644
--- a/lib/adodb/tests/benchmark.php
+++ b/lib/adodb/tests/benchmark.php
@@ -8,7 +8,7 @@
EOF) {
if ($cnt++ > 1000) break;
}
-echo "";
$db = NewADOConnection($dbType);
$dict = NewDataDictionary($db);
@@ -78,19 +78,33 @@ TS T DEFTIMESTAMP";
printsqla($dbType,$sqla);
if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
- if ($dbType == 'mysql') {
+ if ($dbType == 'mysqlt') {
$db->Connect('localhost', "root", "", "test");
$dict->SetSchema('');
$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
if ($sqla2) printsqla($dbType,$sqla2);
}
- if ($dbType == 'postgres') {
- $db->Connect('localhost', "tester", "test", "test");
+ if ($dbType == 'postgres') {
+ if (@$db->Connect('localhost', "tester", "test", "test"));
$dict->SetSchema('');
$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
if ($sqla2) printsqla($dbType,$sqla2);
}
+ if ($dbType == 'odbc_mssql') {
+ $dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=localhost;Database=northwind;";
+ if (@$db->Connect($dsn, "sa", "natsoft", "test"));
+ $dict->SetSchema('');
+ $sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+ if ($sqla2) printsqla($dbType,$sqla2);
+ }
+
+
+
+ adodb_pr($dict->databaseType);
+ printsqla($dbType, $dict->DropColumnSQL('table',array('`col`','col2')));
+ printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME varchar(32)'));
+
}
function printsqla($dbType,$sqla)
@@ -224,6 +238,7 @@ ALTER TABLE KUTU.testtable ALTER COLUMN weight REAL NOT NULL;
--------------------------------------------------------------------------------
*/
+
echo "
Test XML Schema ";
$ff = file('xmlschema.xml');
echo "";
diff --git a/lib/adodb/tests/test-php5.php b/lib/adodb/tests/test-php5.php
index 6592503e7a2..02ae72adc1d 100644
--- a/lib/adodb/tests/test-php5.php
+++ b/lib/adodb/tests/test-php5.php
@@ -1,6 +1,6 @@
PHP ".PHP_VERSION."\n";
try {
-$dbt = 'oci8po';
+$dbt = 'mysql';
+try {
switch($dbt) {
case 'oci8po':
$db = NewADOConnection("oci8po");
+
$db->Connect('','scott','natsoft');
break;
default:
case 'mysql':
$db = NewADOConnection("mysql");
- $db->Connect('localhost','root','','test');
+ $db->Connect('localhost','roots','','northwind');
break;
case 'mysqli':
- $db = NewADOConnection("mysqli://root:@localhost/test");
+ $db = NewADOConnection("mysqli://root:@localhost/northwind");
//$db->Connect('localhost','root','','test');
break;
}
+} catch (exception $e){
+ echo "Connect Failed";
+ adodb_pr($e);
+ die();
+}
$db->debug=1;
@@ -44,16 +51,19 @@ $stmt = $db->Prepare("select * from adoxyz where ?ErrorMsg(),"\n";
$rs = $db->Execute($stmt,array(10,20));
+echo "$msg ADODB Version: $ADODB_vers Host: $db->host Database: $db->database PHP: $phpv $ext ";
flush();
+
+
$arr = $db->ServerInfo();
print_r($arr);
- echo "$db->Time failed ';
- else echo "$db->Time failed ';
+ else echo "date1 (1969-02-20) = ".$db->DBDate('1969-2-20');
- print "date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
- print "date1.1 1999 = ".$db->DBDate("'1999'");
- print "date2 (1970-1-2) = ".$db->DBDate(24*3600)."";
+ print "date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
+ print "date1.1 1999 = ".$db->DBDate("'1999'");
+ print "date2 (1970-1-2) = ".$db->DBDate(24*3600)."
";
print "ts1 (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
- print "ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
- print "ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
- print "ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
- print "ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
+ print "ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
+ print "ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
+ print "
";
- print "ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
- print "ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
- print "ts6 =".$db->UserTimeStamp("20040110092123");
- print "ts7 =".$db->DBTimeStamp("20040110092123");
+ print "
";
+ print "ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
+ print "ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
+ print "ts6 =".$db->UserTimeStamp("20040110092123");
+ print "ts7 =".$db->DBTimeStamp("20040110092123");
flush();
// mssql too slow in failing bad connection
if (false && $db->databaseType != 'mssql') {
- print "
Testing bad connection. Ignore following error msgs:
Testing bad connection. Ignore following error msgs:
Test select on empty table, FetchField when EOF, and GetInsertSQL
";
$rs = &$db->Execute("select id,firstname from ADOXYZ where id=9999");
if ($rs && !$rs->EOF) print "Error: RecordSet returned by Execute(select...') on empty table should show EOF";
- if ($rs->EOF && ($o = $rs->FetchField(0))) {
+ if ($rs->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
$record['id'] = 99;
$record['firstname'] = 'John';
$sql = $db->GetInsertSQL($rs, $record);
- if ($sql != "INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )") Err("GetInsertSQL does not work on empty table");
+ if (strtoupper($sql) != strtoupper("INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )")) Err("GetInsertSQL does not work on empty table: $sql");
} else {
Err("FetchField does not work on empty recordset, meaning GetInsertSQL will fail...");
}
@@ -277,12 +275,18 @@ FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_to
print '';
}
+ $db->debug=0;
+ $rez = $db->MetaColumns("NOSUCHTABLEHERE");
+ if ($rez !== false) {
+ Err("MetaColumns error handling failed");
+ var_dump($rez);
+ }
$db->debug=1;
$a = $db->MetaColumns('ADOXYZ');
if ($a===false) print "MetaColumns not supported ";
else {
- print "Columns of ADOXYZ: Columns of ADOXYZ: MetaIndexes not supported
";
else {
- print "Indexes of ADOXYZ: Indexes of ADOXYZ:
";
} else print "(Today +10days) = (begin=$begin_date end=$end_date)
";
@@ -407,9 +420,16 @@ GO
break;
case 'oci8':
case 'oci8po':
+
+ # cleanup
+ $db->Execute("delete from photos where id=99 or id=1");
+ $db->Execute("insert into photos (id) values(1)");
+ $db->Execute("update photos set photo=null,descclob=null where id=1");
+
$saved = $db->debug;
$db->debug=true;
+
/*
CREATE TABLE PHOTOS
@@ -427,7 +447,25 @@ GO
$s .= '1234567890';
}
+ $sql = "INSERT INTO photos ( ID, photo) ".
+ "VALUES ( :id, empty_blob() )".
+ " RETURNING photo INTO :xx";
+
+ $blob_data = $s;
+ $id = 99;
+
+ $stmt = $db->PrepareSP($sql);
+ $db->InParameter($stmt, $id, 'id');
+ $blob = $db->InParameter($stmt, $s, 'xx',-1, OCI_B_BLOB);
+ $db->StartTrans();
+ $result = $db->Execute($stmt);
+ $db->CompleteTrans();
+
+ $s2= $db->GetOne("select photo from photos where id=99");
+ echo "
Testing Blob: size=".strlen($s)." ";
$ok = $db->Updateblob('photos','photo',$s,'id=1');
if (!$ok) Err("Blob failed 1");
@@ -451,16 +489,17 @@ GO
$arr = $db->MetaForeignKeys('emp');
print_r($arr);
if (!$arr) Err("Bad MetaForeignKeys");
- print "Testing Cursor Variables ";
/*
-- TEST PACKAGE
+-- "Set scan off" turns off substitution variables.
+Set scan off;
CREATE OR REPLACE PACKAGE Adodb AS
TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
-
+PROCEDURE data_in(input IN VARCHAR);
PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
END Adodb;
/
@@ -477,11 +516,17 @@ PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
tablenames := 'TEST';
END open_tab2;
-
+
PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
BEGIN
output := 'Cinta Hati '||input;
END;
+
+PROCEDURE data_in(input IN VARCHAR) IS
+ ignore varchar(1000);
+ BEGIN
+ ignore := input;
+ END;
PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
BEGIN
@@ -490,8 +535,9 @@ END;
END Adodb;
/
-
*/
+
+ print "Testing Cursor Variables ";
$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); END;",'zz');
if ($rs && !$rs->EOF) {
@@ -501,6 +547,7 @@ END Adodb;
} else {
print "Error in using Cursor Variables 1 ";
}
+ $rs->Close();
print "
Testing Stored Procedures for oci8 ";
@@ -517,7 +564,6 @@ END Adodb;
print "Error in using Stored Procedure IN/Out Variables ";
}
-
$tname = 'A%';
$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
@@ -525,6 +571,10 @@ END Adodb;
$rs = $db->Execute($stmt);
rs2html($rs);
+ $stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
+ $db->InParameter($stmt,$a1,'a1');
+ $db->Execute($stmt);
+
$db->debug = $saved;
break;
@@ -577,7 +627,8 @@ END Adodb;
$arr = array(0=>'Caroline',1=>'Miranda');
$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
break;
-
+ case 'mysqli':
+ case 'mysqlt':
case 'mysql':
$sqlt = "CREATE TABLE `mytable` (
`row1` int(11) NOT NULL auto_increment,
@@ -644,17 +695,15 @@ END Adodb;
else if ($nrows != $cnt) print "
Affected_Rows() Error: $nrows returned (should be 50)
";
else print "Affected_Rows() passed
";
}
-
-
+
$array = array('zid'=>1,'zdate'=>date('Y-m-d',time()));
$id = $db->GetOne("select id from ADOXYZ
where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
$array);
if ($id != 1) Err("Bad bind; id=$id");
- else echo "SelectLimit Distinct Test 1: Should see Caroline, John and Mary
";
- $rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
+
echo "Date Update Test
";
$zdate = date('Y-m-d',time()+3600*24);
$zdate = $db->DBDate($zdate);
$db->Execute("update ADOXYZ set created=$zdate where id=1");
$row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
- print_r($row); echo "SelectLimit Distinct Test 1: Should see Caroline, John and Mary
";
+ $rs = &$db->SelectLimit('select distinct * from ADOXYZ order by id',3);
- //$zdate = date('Y-m-d',time()+3600*24);
- //$db->Execute("update ADOXYZ set created=? where id=2",$zdate);
- //$zdate = $db->GetOne("select created from ADOXYZ where id=2");
- //echo "tomorrow=",$zdate,"SelectLimit Test 2: Should see Mary, George and Mr. Alan
";
$rs = &$db->SelectLimit('select * from ADOXYZ order by id',3,2);
if ($rs && !$rs->EOF) {
- if (trim($rs->fields[1]) != 'Mary') Err("Error 1");
+ if (trim($rs->fields[1]) != 'Mary') Err("Error 1 - No Mary, instead: ".$rs->fields[1]);
$rs->MoveNext();
- if (trim($rs->fields[1]) != 'George')Err("Error 2");
+ if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, instead: ".$rs->fields[1]);
$rs->MoveNext();
- if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3");
+ if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. Alan, instead: ".$rs->fields[1]);
$rs->MoveNext();
if (! $rs->EOF) Err("Error EOF");
// rs2html($rs);
}
- else Err("Failed SelectLimit Test 2");
+ else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
print "SelectLimit Test 3: Should see Wai Hun and Steven
";
$db->debug=1;
@@ -878,25 +928,25 @@ END Adodb;
if (trim($rs->Fields("firstname")) != 'Caroline') {
print "$db->databaseType: MoveFirst failed -- probably cannot scroll backwards
";
}
- else print "MoveFirst() OK'.$rs->Fields("id")."$db->databaseType: Move(3) failed
";
- } else print "Move(3) OK'.$rs->Fields("id")."$db->databaseType: Move(7) failed
";
print_r($rs);
- } else print "Move(7) OK'.$rs->Fields("id")."$db->databaseType: MoveLast() failed
";
print_r($rs);
- }else print "MoveLast() OK'.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
";
- } else print "Move(3) after MoveLast() OKEmpty Move Test";
@@ -942,13 +992,13 @@ END Adodb;
$rs = &$db->Execute("select * from ADOXYZ order by id");
if ($rs) {
$arr = &$rs->GetArray(10);
- if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]." ERROR ERROR $e ($e2) $e ($e2) FAILED FAILED ERROR ERROR ERROR ERROR
Connection object missing from recordset ";
- } else print " Fail
CacheEXecute ";
+
+ $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+ $rs = &$db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
+ print_r($rs->fields); echo $rs->fetchMode;echo "**Testing '$sql' (phplens compat 2)
";
$rs = &$db->Execute($sql);
- if (!$rs) err( "No recordset returned for '$sql' ");
+ if (!$rs) err( "No recordset returned for '$sql' ");
$sql = 'select * from ADOXYZ order by 1,1';
echo "**Testing '$sql' (phplens compat 3)
";
$rs = &$db->Execute($sql);
- if (!$rs) err( "No recordset returned for '$sql' ");
+ if (!$rs) err( "No recordset returned for '$sql' ");
// Move
@@ -1089,7 +1150,7 @@ END Adodb;
} else
print "ADO skipped error handling of bad select statement
";
- print "ASSOC TEST 2
ASSOC TEST 2
BOTH TEST 2
BOTH TEST 2ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
NUM TEST 2
NUM TEST 2
ASSOC Test of SelectLimit
ASSOC Test of SelectLimitASSOC returned numeric field
";
+ print "ASSOC returned numeric field
";
break;
}
$rs->MoveNext();
}
- if ($cnt != 3) print "Count should be 3, instead it was $cnt ";
+ if ($cnt != 3) print "Count should be 3, instead it was $cnt ";
$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
@@ -1188,7 +1249,7 @@ END Adodb;
$rs = $db->SelectLimit($sql,1);
$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
if (!$rs) Err("SQLDate query returned no recordset");
- else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: Test Filter
";
@@ -1255,13 +1316,13 @@ END Adodb;
print "rs2rs Test ";
- $rs = $db->Execute('select * from adoxyz order by id');
+ $rs = $db->Execute('select * from adoxyz where id>= 1 order by id');
$rs = $db->_rs2rs($rs);
$rs->valueX = 'X';
$rs->MoveNext();
$rs = $db->_rs2rs($rs);
if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
- if (reset($rs->fields) != 1) err("rs2rs does not move to first row");
+ if (reset($rs->fields) != 1) err("rs2rs does not move to first row: id=".reset($rs->fields));
/////////////////////////////////////////////////////////////
include_once('../pivottable.inc.php');
@@ -1413,7 +1474,7 @@ END Adodb;
$metae = $db->MetaError($ERRNO);
if ($metae !== DB_ERROR_NOSUCHTABLE) print "MetaError=".$metae." wrong , should be ".DB_ERROR_NOSUCHTABLE."
";
else print "MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."
";
- if ($TESTERRS != 1) print "raiseErrorFn select nowhere failed raiseErrorFn select nowhere failed ";
////////////////////////////////////////////////////////////////////
+ if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
$conn = NewADOConnection($db->databaseType);
$conn->raiseErrorFn = 'adodb_test_err';
@$conn->PConnect('abc');
- if ($TESTERRS == 2) print "raiseErrorFn tests passedraiseErrorFn tests failed ($TESTERRS) raiseErrorFn tests failed ($TESTERRS) ** $dbms ($fn): errno=$errno errmsg=$errmsg ($p1,$p2) ** $dbms ($fn): errno=$errno errmsg=$errmsg ($p1,$p2) GetInsertSQL/GetUpdateSQL
vers=",ADOConnection::Version();
+echo "
ADODB Database Library (c) 2000-2004 John Lim. All rights reserved. Released under BSD and LGPL.
+ADODB Database Library (c) 2000-2005 John Lim. All rights reserved. Released under BSD and LGPL.