Index: trunk/kernel/include/adodb/adodb-lib.inc.php
===================================================================
diff -u -N
--- trunk/kernel/include/adodb/adodb-lib.inc.php (revision 13)
+++ trunk/kernel/include/adodb/adodb-lib.inc.php (revision 0)
@@ -1,456 +0,0 @@
- $value)
- $new_array[strtoupper($key)] = $value;
-
- return $new_array;
- }
-
- return $an_array;
-}
-
-// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM
-function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false,
- $size=0, $selectAttr='',$compareFields0=true)
-{
- $hasvalue = false;
-
- if ($multiple or is_array($defstr)) {
- if ($size==0) $size=5;
- $attr = " multiple size=$size";
- if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = " size=$size";
- else $attr ='';
-
- $s = "\n";
-}
-
-/*
- Count the number of records this sql statement will return by using
- query rewriting techniques...
-
- Does not work with UNIONs.
-*/
-function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
-{
- if (preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || preg_match('/\s+GROUP\s+BY\s+/is',$sql)) {
- // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias
- // but this is only supported by oracle and postgresql...
- if ($zthis->dataProvider == 'oci8') {
-
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
- $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
-
- } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
-
- $info = $zthis->ServerInfo();
- if (substr($info['version'],0,3) >= 7.1) { // good till version 999
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
- $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_";
- }
- }
- } else {
- // now replace SELECT ... FROM with SELECT COUNT(*) FROM
-
- $rewritesql = preg_replace(
- '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
-
- // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails
- // with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
- }
-
- if (isset($rewritesql) && $rewritesql != $sql) {
- if ($secs2cache) {
- // we only use half the time of secs2cache because the count can quickly
- // become inaccurate if new records are added
- $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr);
-
- } else {
- $qryRecs = $zthis->GetOne($rewritesql,$inputarr);
- }
- if ($qryRecs !== false) return $qryRecs;
- }
-
- // query rewrite failed - so try slower way...
- $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
- $rstest = &$zthis->Execute($rewritesql);
- if ($rstest) {
- $qryRecs = $rstest->RecordCount();
- if ($qryRecs == -1) {
- global $ADODB_EXTENSION;
- // some databases will return -1 on MoveLast() - change to MoveNext()
- if ($ADODB_EXTENSION) {
- while(!$rstest->EOF) {
- adodb_movenext($rstest);
- }
- } else {
- while(!$rstest->EOF) {
- $rstest->MoveNext();
- }
- }
- $qryRecs = $rstest->_currentRow;
- }
- $rstest->Close();
- if ($qryRecs == -1) return 0;
- }
-
- return $qryRecs;
-}
-
-/*
- Code originally from "Cornel G"
-
- This code will not work with SQL that has UNION in it
-
- Also if you are using CachePageExecute(), there is a strong possibility that
- data will get out of synch. use CachePageExecute() only with tables that
- rarely change.
-*/
-function &_adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page,
- $inputarr=false, $arg3=false, $secs2cache=0)
-{
- $atfirstpage = false;
- $atlastpage = false;
- $lastpageno=1;
-
- // If an invalid nrows is supplied,
- // we assume a default value of 10 rows per page
- if (!isset($nrows) || $nrows <= 0) $nrows = 10;
-
- $qryRecs = false; //count records for no offset
-
- $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache);
- $lastpageno = (int) ceil($qryRecs / $nrows);
- $zthis->_maxRecordCount = $qryRecs;
-
- // If page number <= 1, then we are at the first page
- if (!isset($page) || $page <= 1) {
- $page = 1;
- $atfirstpage = true;
- }
-
- // ***** Here we check whether $page is the last page or
- // whether we are trying to retrieve
- // a page number greater than the last page number.
- if ($page >= $lastpageno) {
- $page = $lastpageno;
- $atlastpage = true;
- }
-
- // We get the data we want
- $offset = $nrows * ($page-1);
- if ($secs2cache > 0)
- $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr, $arg3);
- else
- $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $arg3, $secs2cache);
-
-
- // Before returning the RecordSet, we set the pagination properties we need
- if ($rsreturn) {
- $rsreturn->_maxRecordCount = $qryRecs;
- $rsreturn->rowsPerPage = $nrows;
- $rsreturn->AbsolutePage($page);
- $rsreturn->AtFirstPage($atfirstpage);
- $rsreturn->AtLastPage($atlastpage);
- $rsreturn->LastPageNo($lastpageno);
- }
- return $rsreturn;
-}
-
-// Iv�n Oliva version
-function &_adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $arg3=false, $secs2cache=0)
-{
-
- $atfirstpage = false;
- $atlastpage = false;
-
- if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page
- $page = 1;
- $atfirstpage = true;
- }
- if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page
-
- // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than
- // the last page number.
- $pagecounter = $page + 1;
- $pagecounteroffset = ($pagecounter * $nrows) - $nrows;
- if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr, $arg3);
- else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $arg3, $secs2cache);
- if ($rstest) {
- while ($rstest && $rstest->EOF && $pagecounter>0) {
- $atlastpage = true;
- $pagecounter--;
- $pagecounteroffset = $nrows * ($pagecounter - 1);
- $rstest->Close();
- if ($secs2cache>0) $rstest = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr, $arg3);
- else $rstest = &$zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $arg3, $secs2cache);
- }
- if ($rstest) $rstest->Close();
- }
- if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it
- $page = $pagecounter;
- if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first
- //... page, that is, the recordset has only 1 page.
- }
-
- // We get the data we want
- $offset = $nrows * ($page-1);
- if ($secs2cache > 0) $rsreturn = &$zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr, $arg3);
- else $rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $arg3, $secs2cache);
-
- // Before returning the RecordSet, we set the pagination properties we need
- if ($rsreturn) {
- $rsreturn->rowsPerPage = $nrows;
- $rsreturn->AbsolutePage($page);
- $rsreturn->AtFirstPage($atfirstpage);
- $rsreturn->AtLastPage($atlastpage);
- }
- return $rsreturn;
-}
-
-function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false)
-{
- if (!$rs) {
- printf(ADODB_BAD_RS,'GetUpdateSQL');
- return false;
- }
-
- $fieldUpdatedCount = 0;
- $arrFields = _array_change_key_case($arrFields);
-
- // Get the table name from the existing query.
- preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName);
-
- // Get the full where clause excluding the word "WHERE" from
- // the existing query.
- preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause);
-
- $discard = false;
- // not a good hack, improvements?
- if ($whereClause)
- preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard);
-
- if ($discard)
- $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1]));
-
- // updateSQL will contain the full update query when all
- // processing has completed.
- $updateSQL = "UPDATE " . $tableName[1] . " SET ";
-
- $hasnumeric = isset($rs->fields[0]);
-
- // Loop through all of the fields in the recordset
- for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-
- // Get the field from the recordset
- $field = $rs->FetchField($i);
-
- // If the recordset field is one
- // of the fields passed in then process.
- $upperfname = strtoupper($field->name);
- if (isset($arrFields[$upperfname])) {
-
- // 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
- // the update query.
-
- if ($hasnumeric) $val = $rs->fields[$i];
- else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname];
- else $val = '';
-
- if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
- // Set the counter for the number of fields that will be updated.
- $fieldUpdatedCount++;
-
- // Based on the datatype of the field
- // Format the value properly for the database
- $mt = $rs->MetaType($field->type);
-
- // "mike" patch and "Ryan Bailey"
- //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field.
- if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C";
- // is_null requires php 4.0.4
- if (/*is_null($arrFields[$fieldname]) ||*/ $arrFields[$upperfname] === 'null')
- $updateSQL .= $field->name . " = null, ";
- else
- switch($mt) {
- case 'null':
- case "C":
- case "X":
- case 'B':
- $updateSQL .= $field->name . " = " . $zthis->qstr($arrFields[$upperfname],$magicq) . ", ";
- break;
- case "D":
- $updateSQL .= $field->name . " = " . $zthis->DBDate($arrFields[$upperfname]) . ", ";
- break;
- case "T":
- $updateSQL .= $field->name . " = " . $zthis->DBTimeStamp($arrFields[$upperfname]) . ", ";
- break;
- default:
- $val = $arrFields[$upperfname];
- if (!is_numeric($val)) $val = (float) $val;
- $updateSQL .= $field->name . " = " . $val . ", ";
- break;
- };
- };
- };
- };
-
- // If there were any modified fields then build the rest of the update query.
- if ($fieldUpdatedCount > 0 || $forceUpdate) {
- // Strip off the comma and space on the end of the update query.
- $updateSQL = substr($updateSQL, 0, -2);
-
- // If the recordset has a where clause then use that same where clause
- // for the update.
- if ($whereClause[1]) $updateSQL .= " WHERE " . $whereClause[1];
-
- return $updateSQL;
- } else {
- return false;
- };
-}
-
-function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false)
-{
- $values = '';
- $fields = '';
- $arrFields = _array_change_key_case($arrFields);
- if (!$rs) {
- printf(ADODB_BAD_RS,'GetInsertSQL');
- return false;
- }
-
- $fieldInsertedCount = 0;
-
- // Get the table name from the existing query.
- preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName);
-
- // Loop through all of the fields in the recordset
- for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
-
- // Get the field from the recordset
- $field = $rs->FetchField($i);
- // If the recordset field is one
- // of the fields passed in then process.
- $upperfname = strtoupper($field->name);
- if (isset($arrFields[$upperfname])) {
-
- // Set the counter for the number of fields that will be inserted.
- $fieldInsertedCount++;
-
- // Get the name of the fields to insert
- $fields .= $field->name . ", ";
-
- $mt = $rs->MetaType($field->type);
-
- // "mike" patch and "Ryan Bailey"
- //PostgreSQL uses a 't' or 'f' and therefore needs to be processed as a string ('C') type field.
- if ((strncmp($zthis->databaseType,"postgres",8) === 0) && ($mt == "L")) $mt = "C";
-
- // Based on the datatype of the field
- // Format the value properly for the database
- if (/*is_null($arrFields[$fieldname]) ||*/ $arrFields[$upperfname] === 'null')
- $values .= "null, ";
- else
- switch($mt) {
- case "C":
- case "X":
- case 'B':
- $values .= $zthis->qstr($arrFields[$upperfname],$magicq) . ", ";
- break;
- case "D":
- $values .= $zthis->DBDate($arrFields[$upperfname]) . ", ";
- break;
- case "T":
- $values .= $zthis->DBTimeStamp($arrFields[$upperfname]) . ", ";
- break;
- default:
- $val = $arrFields[$upperfname];
- if (!is_numeric($val)) $val = (float) $val;
- $values .= $val . ", ";
- break;
- };
- };
- };
-
- // If there were any inserted fields then build the rest of the insert query.
- if ($fieldInsertedCount > 0) {
-
- // Strip off the comma and space on the end of both the fields
- // and their values.
- $fields = substr($fields, 0, -2);
- $values = substr($values, 0, -2);
-
- // Append the fields and their values to the insert query.
- $insertSQL = "INSERT INTO " . $tableName[1] . " ( $fields ) VALUES ( $values )";
-
- return $insertSQL;
-
- } else {
- return false;
- };
-}
-?>
\ No newline at end of file