diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/adodb-ado.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-ado5.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-ads.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-csv.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-db2.inc.php | 100 | ||||
| -rw-r--r-- | drivers/adodb-db2oci.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-db2ora.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-firebird.inc.php | 8 | ||||
| -rw-r--r-- | drivers/adodb-ibase.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-ldap.inc.php | 10 | ||||
| -rw-r--r-- | drivers/adodb-odbc.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-odbc_db2.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-pdo.inc.php | 6 | ||||
| -rw-r--r-- | drivers/adodb-pdo_dblib.inc.php | 2 | ||||
| -rw-r--r-- | drivers/adodb-pdo_firebird.inc.php | 6 | ||||
| -rw-r--r-- | drivers/adodb-postgres7.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-sqlanywhere.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-sybase.inc.php | 4 | ||||
| -rw-r--r-- | drivers/adodb-text.inc.php | 2 |
19 files changed, 84 insertions, 84 deletions
diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php index 569f0fcb..aa8a6197 100644 --- a/drivers/adodb-ado.inc.php +++ b/drivers/adodb-ado.inc.php @@ -397,7 +397,7 @@ class ADORecordSet_ado extends ADORecordSet { // $rs->AbsolutePosition->$row-2; // return true; if ($this->_currentRow > $row) return false; - @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst + @$rs->Move((int)$row - $this->_currentRow-1); //adBookmarkFirst return true; } diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php index 4ef1da98..76b85335 100644 --- a/drivers/adodb-ado5.inc.php +++ b/drivers/adodb-ado5.inc.php @@ -441,7 +441,7 @@ class ADORecordSet_ado extends ADORecordSet { // $rs->AbsolutePosition->$row-2; // return true; if ($this->_currentRow > $row) return false; - @$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst + @$rs->Move((int)$row - $this->_currentRow-1); //adBookmarkFirst return true; } diff --git a/drivers/adodb-ads.inc.php b/drivers/adodb-ads.inc.php index e6cd4f3b..5362123f 100644 --- a/drivers/adodb-ads.inc.php +++ b/drivers/adodb-ads.inc.php @@ -371,7 +371,7 @@ class ADODB_ads extends ADOConnection */ function ODBCTypes($t) { - switch ((integer)$t) { + switch ((int)$t) { case 1: case 12: case 0: diff --git a/drivers/adodb-csv.inc.php b/drivers/adodb-csv.inc.php index e6694d9a..8f1a7dd6 100644 --- a/drivers/adodb-csv.inc.php +++ b/drivers/adodb-csv.inc.php @@ -103,7 +103,7 @@ class ADODB_csv extends ADOConnection { $at = strpos($err,'::::'); if ($at === false) { $this->_errorMsg = $err; - $this->_errorNo = (integer)$err; + $this->_errorNo = (int)$err; } else { $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; @@ -159,7 +159,7 @@ class ADODB_csv extends ADOConnection { $at = strpos($err,'::::'); if ($at === false) { $this->_errorMsg = $err; - $this->_errorNo = (integer)$err; + $this->_errorNo = (int)$err; } else { $this->_errorMsg = substr($err,$at+4,1024); $this->_errorNo = -9999; diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php index be2c7b8a..c5f9992a 100644 --- a/drivers/adodb-db2.inc.php +++ b/drivers/adodb-db2.inc.php @@ -60,10 +60,10 @@ class ADODB_db2 extends ADOConnection { var $useFetchArray = false; var $_bindInputArray = true; var $_genIDSQL = "VALUES NEXTVAL FOR %s"; - + /** * SQL to create a new sequence - * + * * @var string */ var $_genSeqSQL = " @@ -73,8 +73,8 @@ class ADODB_db2 extends ADOConnection { /** * SQL to drop a sequence - * - * @var string + * + * @var string */ var $_dropSeqSQL = "DROP SEQUENCE %s"; @@ -471,15 +471,15 @@ class ADODB_db2 extends ADOConnection { /* * If no column is provided, we use the system date or time */ - + $dCol = $this->sysDate; $tCol = $this->sysTime; - + /* * Anything not from a column needs this */ $trailer = 'FROM SYSIBM.SYSDUMMY1'; - + } else if (preg_match('/(\d{4})-(\d{2})-(\d{2})/',$col)) { /* * If the column is an ISO date string, we use it as is @@ -501,40 +501,40 @@ class ADODB_db2 extends ADOConnection { if ($s) { $s .= $this->concat_operator; } - + $ch = $fmt[$i]; - + switch($ch) { case 'Y': case 'y': - + if ($len==1) { return "YEAR($col$dCol) $trailer"; } - + /* * the CHAR creates a CHAR(20) so trim it */ $s .= "RTRIM(CHAR(YEAR($col$dCol)))"; - + break; case 'M': - + /* * Returns "January" we want "Jan" */ $cmd = "SUBSTR(MONTHNAME($col$dCol),1,3)"; - + if ($len==1) { return "$cmd $trailer"; } $s .= $cmd; - + break; case 'm': - + $cmd = "RIGHT(DIGITS(MONTH($col$dCol)),2)"; if ($len==1) { return "$cmd $trailer"; @@ -557,14 +557,14 @@ class ADODB_db2 extends ADOConnection { case 'H': case 'h': - + $cmd = "RIGHT(DIGITS(HOUR($col$tCol)),2)"; if ($len==1) { return "$cmd $trailer"; } - + $s .= $cmd; - + break; case 'i': @@ -574,28 +574,28 @@ class ADODB_db2 extends ADOConnection { if ($len==1) { return "$cmd $trailer"; } - + $s .= $cmd; - + break; - + case 'S': case 's': $cmd = "RIGHT(DIGITS(SECOND($col$tCol)),2)"; if ($len==1) { return "$cmd $trailer"; } - + $s .= $cmd; break; default: - + if ($ch == '\\') { $i++; $ch = substr($fmt, $i, 1); } - + $s .= $this->qstr($ch); } } @@ -614,7 +614,7 @@ class ADODB_db2 extends ADOConnection { { global $ADODB_FETCH_MODE; $savem = $ADODB_FETCH_MODE; - + $this->setFetchMode(ADODB_FETCH_NUM); $sql = "SELECT service_level, fixpack_num @@ -641,14 +641,14 @@ class ADODB_db2 extends ADOConnection { * @param string $sql The SQL to execute * @param int $nrows Number of rows to get * @param int $offset Row to start calculations from (1-based) - * @param array|bool $inputArr Array of bind variables + * @param array|bool $inputArr Array of bind variables * @param int $secs2cache Private parameter only used by jlim * * @return ADORecordSet The recordset ($rs->databaseType == 'array') */ function selectLimit($sql, $nrows=-1, $offset=-1, $inputArr=false, $secs2cache=0) { - $nrows = (integer) $nrows; + $nrows = (int) $nrows; if ($this->useLegacyRowOffsets) { /* @@ -661,7 +661,7 @@ class ADODB_db2 extends ADOConnection { $rs = $this->execute($sql, $inputArr); } else { - + if ($offset > 0 && $nrows < 0) { } else { @@ -861,9 +861,9 @@ class ADODB_db2 extends ADOConnection { $table = $metaTables[0]; $baseFetchMode = $ADODB_FETCH_MODE; - + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; - + $this->setFetchMode(ADODB_FETCH_ASSOC); $sql = "SELECT * FROM syscat.references @@ -872,7 +872,7 @@ class ADODB_db2 extends ADOConnection { $results = $this->getAll($sql); $this->setFetchMode($baseFetchMode); - + if (empty($results)) return false; @@ -882,7 +882,7 @@ class ADODB_db2 extends ADOConnection { { /* - + [CONSTNAME] => SQL250829011849680 [TABSCHEMA] => DB2INST1 [TABNAME] => TESTTABLE_2 @@ -895,8 +895,8 @@ class ADODB_db2 extends ADOConnection { [DELETERULE] => C [UPDATERULE] => A [CREATE_TIME] => 2025-08-29 01:18:49.717630 - [FK_COLNAMES] => TT_ID - [PK_COLNAMES] => ID + [FK_COLNAMES] => TT_ID + [PK_COLNAMES] => ID [DEFINER] => DB2INST1 ) */ @@ -917,7 +917,7 @@ class ADODB_db2 extends ADOConnection { } else { $foreignKeys[$referenceTable][] = sprintf('%s=%s',$pkColname,$fkColname); } - + } } @@ -935,12 +935,12 @@ class ADODB_db2 extends ADOConnection { */ public function metaTables($ttype=false,$schema=false,$mask=false) { - + global $ADODB_FETCH_MODE; $savem = $ADODB_FETCH_MODE; $this->SetFetchMode(ADODB_FETCH_ASSOC); - + /* * Values for TABLE_TYPE * --------------------------- @@ -964,7 +964,7 @@ class ADODB_db2 extends ADOConnection { * All types are returned if $ttype is passed as '' */ $ttype = strtoupper(substr($ttype,0,1)); - + if ($ttype == 'V') { $sqlFilters[] = "TYPE='V'"; } else if ($ttype == 'T') { @@ -973,7 +973,7 @@ class ADODB_db2 extends ADOConnection { } if ($schema && $schema != '%') { - + $schema = strtoupper($schema); $returnedColumn = $this->concat('TRIM(TABSCHEMA)',"'.'",'TRIM(TABNAME)'); @@ -990,10 +990,10 @@ class ADODB_db2 extends ADOConnection { * unless the match is quoted in which case we match * exactly */ - + if (in_array(substr($mask,0,1),array('"','['))) { - if (strpos($mask,'%') !== false) + if (strpos($mask,'%') !== false) { $sqlFilters[] = "TABNAME LIKE '$mask'"; } else { @@ -1011,15 +1011,15 @@ class ADODB_db2 extends ADOConnection { if (count($sqlFilters) > 0) { $sqlFilter = 'WHERE ' . implode(' AND ',$sqlFilters); - } + } $sql = "SELECT $returnedColumn FROM SYSCAT.TABLES $sqlFilter ORDER BY TABSCHEMA, TABNAME"; $metaTables = $this->getCol($sql); - + $this->SetFetchMode($savem); - + if (count($metaTables) == 0) return false; @@ -1234,7 +1234,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 */ function DB2Types($t) { - switch ((integer)$t) { + switch ((int)$t) { case 1: case 12: case 0: @@ -1280,7 +1280,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 $this->_findschema($table,$schema); $findMatchingTable = $this->metaTables('T','',$table); - + if ($findMatchingTable === false) return false; @@ -1380,9 +1380,9 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 if (empty($retarr)) $retarr = false; - + $this->setFetchMode(ADODB_FETCH_NUM ); - + /* * Now we find out if the column is part of a primary key */ @@ -1401,7 +1401,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2 } return $retarr; - + $qid = @db2_primary_keys($this->_connectionID, "", $schema, $table); diff --git a/drivers/adodb-db2oci.inc.php b/drivers/adodb-db2oci.inc.php index eea63d94..4e98d141 100644 --- a/drivers/adodb-db2oci.inc.php +++ b/drivers/adodb-db2oci.inc.php @@ -101,7 +101,7 @@ function _colonparser($sql,$arr) $ch2 = $at < $lensql ? $sql[$at] : ''; } while ('0' <= $ch && $ch <= '9'); #echo "$n $arrsize ] "; - $n = (integer) $n; + $n = (int) $n; if ($n < $arrsize) { $sql2 .= substr($sql,$nprev,$nat-$nprev-1).'?'; $nprev = $at-1; diff --git a/drivers/adodb-db2ora.inc.php b/drivers/adodb-db2ora.inc.php index d343a8ae..71b21e90 100644 --- a/drivers/adodb-db2ora.inc.php +++ b/drivers/adodb-db2ora.inc.php @@ -41,7 +41,7 @@ define('ADODB_DB2OCI',1); function _colontrack($p) { global $_COLONARR, $_COLONSZ; - $v = (integer) substr($p[1], 1); + $v = (int) substr($p[1], 1); if ($v > $_COLONSZ) return $p[1]; $_COLONARR[] = $v; return '?'; diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php index 848b3c4e..6d495973 100644 --- a/drivers/adodb-firebird.inc.php +++ b/drivers/adodb-firebird.inc.php @@ -427,7 +427,7 @@ class ADODB_firebird extends ADOConnection { $rs = $this->Execute($getnext); } if ($rs && !$rs->EOF) { - $this->genID = (integer) reset($rs->fields); + $this->genID = (int) reset($rs->fields); } else { $this->genID = 0; // false @@ -454,7 +454,7 @@ class ADODB_firebird extends ADOConnection { public function errorNo() { - return (integer) $this->_errorCode; + return (int) $this->_errorCode; } function errorMsg() @@ -989,8 +989,8 @@ class ADODB_firebird extends ADOConnection { */ public function selectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs2cache=0) { - $nrows = (integer) $nrows; - $offset = (integer) $offset; + $nrows = (int) $nrows; + $offset = (int) $offset; $str = 'SELECT '; if ($nrows >= 0) $str .= "FIRST $nrows "; $str .=($offset>=0) ? "SKIP $offset " : ''; diff --git a/drivers/adodb-ibase.inc.php b/drivers/adodb-ibase.inc.php index 8d48f17d..1eaf07fe 100644 --- a/drivers/adodb-ibase.inc.php +++ b/drivers/adodb-ibase.inc.php @@ -289,7 +289,7 @@ class ADODB_ibase extends ADOConnection { $rs = $this->Execute($getnext); } if ($rs && !$rs->EOF) { - $this->genID = (integer) reset($rs->fields); + $this->genID = (int) reset($rs->fields); } else { $this->genID = 0; // false @@ -314,7 +314,7 @@ class ADODB_ibase extends ADOConnection { function ErrorNo() { - if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1]; + if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (int) $arr[1]; else return 0; } diff --git a/drivers/adodb-ldap.inc.php b/drivers/adodb-ldap.inc.php index 91a47c94..032abbe5 100644 --- a/drivers/adodb-ldap.inc.php +++ b/drivers/adodb-ldap.inc.php @@ -132,11 +132,11 @@ class ADODB_ldap extends ADOConnection /* Valid Domain Values for LDAP Options: - LDAP_OPT_DEREF (integer) - LDAP_OPT_SIZELIMIT (integer) - LDAP_OPT_TIMELIMIT (integer) - LDAP_OPT_PROTOCOL_VERSION (integer) - LDAP_OPT_ERROR_NUMBER (integer) + LDAP_OPT_DEREF (int) + LDAP_OPT_SIZELIMIT (int) + LDAP_OPT_TIMELIMIT (int) + LDAP_OPT_PROTOCOL_VERSION (int) + LDAP_OPT_ERROR_NUMBER (int) LDAP_OPT_REFERRALS (boolean) LDAP_OPT_RESTART (boolean) LDAP_OPT_HOST_NAME (string) diff --git a/drivers/adodb-odbc.inc.php b/drivers/adodb-odbc.inc.php index 59909646..a52d8b02 100644 --- a/drivers/adodb-odbc.inc.php +++ b/drivers/adodb-odbc.inc.php @@ -355,7 +355,7 @@ See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/od */ function ODBCTypes($t) { - switch ((integer)$t) { + switch ((int)$t) { case 1: case 12: case 0: diff --git a/drivers/adodb-odbc_db2.inc.php b/drivers/adodb-odbc_db2.inc.php index 8f0e60cb..a3ac67ed 100644 --- a/drivers/adodb-odbc_db2.inc.php +++ b/drivers/adodb-odbc_db2.inc.php @@ -212,7 +212,7 @@ class ADODB_ODBC_DB2 extends ADODB_odbc { function SelectLimit($sql, $nrows = -1, $offset = -1, $inputArr = false, $secs2cache = 0) { - $nrows = (integer) $nrows; + $nrows = (int) $nrows; if ($offset <= 0) { // could also use " OPTIMIZE FOR $nrows ROWS " if ($nrows >= 0) $sql .= " FETCH FIRST $nrows ROWS ONLY "; diff --git a/drivers/adodb-pdo.inc.php b/drivers/adodb-pdo.inc.php index b4b9d9bc..f25006ba 100644 --- a/drivers/adodb-pdo.inc.php +++ b/drivers/adodb-pdo.inc.php @@ -417,7 +417,7 @@ class ADODB_pdo extends ADOConnection { if (sizeof($arr)<2) { return ''; } - if ((integer)$arr[0]) { + if ((int)$arr[0]) { return $arr[2]; } else { @@ -625,7 +625,7 @@ class ADODB_pdo extends ADOConnection { if ($stmt) { $arr = $stmt->errorinfo(); - if ((integer)$arr[1]) { + if ((int)$arr[1]) { $this->_errormsg = $arr[2]; $this->_errorno = $arr[1]; } @@ -817,7 +817,7 @@ class ADOPDOStatement { } if (is_array($arr)) { - if ((integer) $arr[0] && isset($arr[2])) { + if ((int) $arr[0] && isset($arr[2])) { return $arr[2]; } else { diff --git a/drivers/adodb-pdo_dblib.inc.php b/drivers/adodb-pdo_dblib.inc.php index 124efc29..c3a3554c 100644 --- a/drivers/adodb-pdo_dblib.inc.php +++ b/drivers/adodb-pdo_dblib.inc.php @@ -165,7 +165,7 @@ class ADODB_pdo_dblib extends ADODB_pdo_base if ($stmt) { $arr = $stmt->errorinfo(); - if ((integer)$arr[1]) { + if ((int)$arr[1]) { $this->_errormsg = $arr[2]; $this->_errorno = $arr[1]; } diff --git a/drivers/adodb-pdo_firebird.inc.php b/drivers/adodb-pdo_firebird.inc.php index bf3bcce3..265cde49 100644 --- a/drivers/adodb-pdo_firebird.inc.php +++ b/drivers/adodb-pdo_firebird.inc.php @@ -245,7 +245,7 @@ class ADODB_pdo_firebird extends ADODB_pdo_base $rs = $this->execute($getnext); } if ($rs && !$rs->EOF) { - $this->genID = (integer)reset($rs->fields); + $this->genID = (int)reset($rs->fields); } else { $this->genID = 0; // false } @@ -259,8 +259,8 @@ class ADODB_pdo_firebird extends ADODB_pdo_base public function selectLimit($sql, $nrows = -1, $offset = -1, $inputarr = false, $secs = 0) { - $nrows = (integer)$nrows; - $offset = (integer)$offset; + $nrows = (int)$nrows; + $offset = (int)$offset; $str = 'SELECT '; if ($nrows >= 0) { $str .= "FIRST $nrows "; diff --git a/drivers/adodb-postgres7.inc.php b/drivers/adodb-postgres7.inc.php index b5e63acf..9559eb00 100644 --- a/drivers/adodb-postgres7.inc.php +++ b/drivers/adodb-postgres7.inc.php @@ -117,8 +117,8 @@ class ADODB_postgres7 extends ADODB_postgres64 { { $nrows = (int) $nrows; $offset = (int) $offset; - $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : ''; - $limitStr = ($nrows >= 0) ? " LIMIT ".((integer)$nrows) : ''; + $offsetStr = ($offset >= 0) ? " OFFSET ".((int)$offset) : ''; + $limitStr = ($nrows >= 0) ? " LIMIT ".((int)$nrows) : ''; if ($secs2cache) $rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr); else diff --git a/drivers/adodb-sqlanywhere.inc.php b/drivers/adodb-sqlanywhere.inc.php index 8d909fde..3bbf6155 100644 --- a/drivers/adodb-sqlanywhere.inc.php +++ b/drivers/adodb-sqlanywhere.inc.php @@ -55,7 +55,7 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){ $fd = fopen ($filename, "rb"); - $integer_chunks = (integer)filesize($filename) / $chunk_size; + $integer_chunks = (int)filesize($filename) / $chunk_size; $modulus = filesize($filename) % $chunk_size; if ($modulus != 0){ $integer_chunks += 1; @@ -83,7 +83,7 @@ if (!defined('ADODB_SYBASE_SQLANYWHERE')){ function load_blobvar_from_var($blobVarName, &$varName) { $chunk_size = 1000; - $integer_chunks = (integer)strlen($varName) / $chunk_size; + $integer_chunks = (int)strlen($varName) / $chunk_size; $modulus = strlen($varName) % $chunk_size; if ($modulus != 0){ $integer_chunks += 1; diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php index abadb51c..6c6a2101 100644 --- a/drivers/adodb-sybase.inc.php +++ b/drivers/adodb-sybase.inc.php @@ -188,8 +188,8 @@ class ADODB_sybase extends ADOConnection { return $rs; } - $nrows = (integer) $nrows; - $offset = (integer) $offset; + $nrows = (int) $nrows; + $offset = (int) $offset; $cnt = ($nrows >= 0) ? $nrows : 999999999; if ($offset > 0 && $cnt) $cnt += $offset; diff --git a/drivers/adodb-text.inc.php b/drivers/adodb-text.inc.php index 36a1a0d4..afdfe71d 100644 --- a/drivers/adodb-text.inc.php +++ b/drivers/adodb-text.inc.php @@ -257,7 +257,7 @@ class ADODB_text extends ADOConnection { preg_match("/$eregword/",$orderby,$arr); if (sizeof($arr) < 2) return $this; // actually invalid sql $col = $arr[1]; - $at = (integer) $col; + $at = (int) $col; if ($at == 0) { $i = 0; reset($projnames); |
