Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php (modified) (30 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-mysqli.inc.php

@@ -1 +1 @@
 <?php
 /*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
+V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -29 +29 @@
 class ADODB_mysqli extends ADOConnection {
         var $databaseType = 'mysqli';
-        var $dataProvider = 'native';
+        var $dataProvider = 'mysql';
         var $hasInsertID = true;
         var $hasAffectedRows = true;    
-        var $metaTablesSQL = "SHOW TABLES";     
+        var $metaTablesSQL = "SELECT TABLE_NAME, CASE WHEN TABLE_TYPE = 'VIEW' THEN 'V' ELSE 'T' END FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=SCHEMA()";       
         var $metaColumnsSQL = "SHOW COLUMNS FROM `%s`";
         var $fmtTimeStamp = "'Y-m-d H:i:s'";
@@ -51 +51 @@
         var $nameQuote = '`';           /// string to use to quote identifiers and names
         var $optionFlags = array(array(MYSQLI_READ_DEFAULT_GROUP,0));
+        var $arrayClass = 'ADORecordSet_array_mysqli';
+        var $multiQuery = false;
         
         function ADODB_mysqli() 
@@ -98 +100 @@
                 }
 
+                //http ://php.net/manual/en/mysqli.persistconns.php
+                if ($persist && PHP_VERSION > 5.2 && strncmp($argHostname,'p:',2) != 0) $argHostname = 'p:'.$argHostname;
+
                 #if (!empty($this->port)) $argHostname .= ":".$this->port;
                 $ok = mysqli_real_connect($this->_connectionID,
@@ -114 +119 @@
                         if ($this->debug) 
                                 ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
+                        $this->_connectionID = null;
                         return false;
            }
@@ -142 +148 @@
         function GetOne($sql,$inputarr=false)
         {
+        global $ADODB_GETONE_EOF;
+        
                 $ret = false;
-                $rs = &$this->Execute($sql,$inputarr);
-                if ($rs) {      
-                        if (!$rs->EOF) $ret = reset($rs->fields);
+                $rs = $this->Execute($sql,$inputarr);
+                if ($rs) {
+                        if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
+                        else $ret = reset($rs->fields);
                         $rs->Close();
                 }
@@ -193 +202 @@
         }
         
-        function RowLock($tables,$where='',$flds='1 as adodb_ignore') 
+        function RowLock($tables,$where='',$col='1 as adodbignore') 
         {
                 if ($this->transCnt==0) $this->BeginTrans();
                 if ($where) $where = ' where '.$where;
-                $rs =& $this->Execute("select $flds from $tables $where for update");
+                $rs = $this->Execute("select $col from $tables $where for update");
                 return !empty($rs); 
         }
@@ -213 +222 @@
         function qstr($s, $magic_quotes = false)
         {
+                if (is_null($s)) return 'NULL';
                 if (!$magic_quotes) {
                 if (PHP_VERSION >= 5)
@@ -249 +259 @@
         var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
         var $_genSeqSQL = "create table %s (id int not null)";
+        var $_genSeqCountSQL = "select count(*) from %s";
         var $_genSeq2SQL = "insert into %s values (%s)";
         var $_dropSeqSQL = "drop table %s";
@@ -288 +299 @@
         }
         
-        function &MetaDatabases()
+        function MetaDatabases()
         {
                 $query = "SHOW DATABASES";
-                $ret =& $this->Execute($query);
+                $ret = $this->Execute($query);
                 if ($ret && is_object($ret)){
                    $arr = array();
@@ -305 +316 @@
 
           
-        function &MetaIndexes ($table, $primary = FALSE)
+        function MetaIndexes ($table, $primary = FALSE, $owner = false)
         {
                 // save old fetch mode
@@ -460 +471 @@
         }
         
-        function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+    function MetaProcedures($NamePattern = false, $catalog  = null, $schemaPattern  = null)
+    {
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+
+        $false = false;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+
+        $procedures = array ();
+
+        // get index details
+
+        $likepattern = '';
+        if ($NamePattern) {
+           $likepattern = " LIKE '".$NamePattern."'";
+        }
+        $rs = $this->Execute('SHOW PROCEDURE STATUS'.$likepattern);
+        if (is_object($rs)) {
+
+            // parse index data into array
+            while ($row = $rs->FetchRow()) {
+                    $procedures[$row[1]] = array(
+                                    'type' => 'PROCEDURE',
+                                    'catalog' => '',
+
+                                    'schema' => '',
+                                    'remarks' => $row[7],
+                            );
+            }
+        }
+
+        $rs = $this->Execute('SHOW FUNCTION STATUS'.$likepattern);
+        if (is_object($rs)) {
+            // parse index data into array
+            while ($row = $rs->FetchRow()) {
+                $procedures[$row[1]] = array(
+                        'type' => 'FUNCTION',
+                        'catalog' => '',
+                        'schema' => '',
+                        'remarks' => $row[7]
+                    );
+            }
+            }
+
+        // restore fetchmode
+        if (isset($savem)) {
+                $this->SetFetchMode($savem);
+
+        }
+        $ADODB_FETCH_MODE = $save;
+
+
+        return $procedures;
+    }
+        
+        function MetaTables($ttype=false,$showSchema=false,$mask=false) 
         {       
                 $save = $this->metaTablesSQL;
@@ -471 +542 @@
                         $this->metaTablesSQL .= " like $mask";
                 }
-                $ret =& ADOConnection::MetaTables($ttype,$showSchema);
+                $ret = ADOConnection::MetaTables($ttype,$showSchema);
                 
                 $this->metaTablesSQL = $save;
@@ -488 +559 @@
             }
             $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
-                if ($associative) $create_sql = $a_create_table["Create Table"];
-            else $create_sql  = $a_create_table[1];
+                if ($associative) {
+                        $create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
+            } else $create_sql  = $a_create_table[1];
         
             $matches = array();
@@ -505 +577 @@
                 }
         
-                $foreign_keys[$ref_table] = array();
-                $num_fields               = count($my_field);
+                // see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+                        if (!isset($foreign_keys[$ref_table])) {
+                                $foreign_keys[$ref_table] = array();
+                        }
+                $num_fields = count($my_field);
                 for ( $j = 0;  $j < $num_fields;  $j ++ ) {
                     if ( $associative ) {
@@ -519 +594 @@
         }
         
-        function &MetaColumns($table) 
+        function MetaColumns($table, $normalize=true) 
         {
                 $false = false;
@@ -553 +628 @@
                         } elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
                                 $fld->type = $query_array[1];
-                                $fld->max_length = max(array_map("strlen",explode(",",$query_array[2]))) - 2; // PHP >= 4.0.6
-                                $fld->max_length = ($fld->max_length == 0 ? 1 : $fld->max_length);
+                                $arr = explode(",",$query_array[2]);
+                                $fld->enums = $arr;
+                                $zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+                                $fld->max_length = ($zlen > 0) ? $zlen : 1;
                         } else {
                                 $fld->type = $type;
@@ -606 +683 @@
         
         // parameters use PostgreSQL convention, not MySQL
-        function &SelectLimit($sql,
+        function SelectLimit($sql,
                               $nrows = -1,
                               $offset = -1,
                               $inputarr = false, 
-                              $arg3 = false,
                               $secs = 0)
         {
@@ -617 +693 @@
                 
                 if ($secs)
-                        $rs =& $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
+                        $rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
                 else
-                        $rs =& $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr , $arg3);
+                        $rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
                         
                 return $rs;
@@ -628 +704 @@
         {
                 return $sql;
-                
                 $stmt = $this->_connectionID->prepare($sql);
                 if (!$stmt) {
@@ -642 +717 @@
         {
         global $ADODB_COUNTRECS;
-                
+                // Move to the next recordset, or return false if there is none. In a stored proc
+                // call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
+                // returns false. I think this is because the last "recordset" is actually just the
+                // return value of the stored proc (ie the number of rows affected).
+                // Commented out for reasons of performance. You should retrieve every recordset yourself.
+                //      if (!mysqli_next_result($this->connection->_connectionID))      return false;
+        
                 if (is_array($sql)) {
+                
+                        // Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
+                        // returns as bound variables.
+                
                         $stmt = $sql[1];
                         $a = '';
@@ -654 +739 @@
                         $fnarr = array_merge( array($stmt,$a) , $inputarr);
                         $ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
-
                         $ret = mysqli_stmt_execute($stmt);
                         return $ret;
                 }
+                
+                /*
                 if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
                     if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
@@ -664 +750 @@
                 
                 return $mysql_res;
+                */
+                
+                if ($this->multiQuery) {
+                        $rs = mysqli_multi_query($this->_connectionID, $sql.';');
+                        if ($rs) {
+                                $rs = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->_connectionID ) : @mysqli_use_result( $this->_connectionID );
+                                return $rs ? $rs : true; // mysqli_more_results( $this->_connectionID )
+                        }
+                } else {
+                        $rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
+                
+                        if ($rs) return $rs;
+                }
+
+                if($this->debug)
+                        ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+                
+                return false;
+                
         }
 
@@ -739 +844 @@
     if ($this->charSet !== $charset_name) {
       $if = @$this->_connectionID->set_charset($charset_name);
-      if ($if == "0" & $this->GetCharSet() == $charset_name) {
+      if ($if === true & $this->GetCharSet() == $charset_name) {
         return true;
       } else return false;
@@ -813 +918 @@
 */
 
-        function &FetchField($fieldOffset = -1) 
+        function FetchField($fieldOffset = -1) 
         {       
                 $fieldnr = $fieldOffset;
                 if ($fieldOffset != -1) {
-                  $fieldOffset = mysqli_field_seek($this->_queryID, $fieldnr);
-                }
-                $o = mysqli_fetch_field($this->_queryID);
+                  $fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
+                }
+                $o = @mysqli_fetch_field($this->_queryID);
+                if (!$o) return false;
                 /* Properties of an ADOFieldObject as set by MetaColumns */
                 $o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
@@ -831 +937 @@
         }
 
-        function &GetRowAssoc($upper = true)
+        function GetRowAssoc($upper = true)
         {
                 if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
                   return $this->fields;
-                $row =& ADORecordSet::GetRowAssoc($upper);
+                $row = ADORecordSet::GetRowAssoc($upper);
                 return $row;
         }
@@ -868 +974 @@
         }
                 
+                
+        function NextRecordSet()
+        {
+        global $ADODB_COUNTRECS;
+        
+                mysqli_free_result($this->_queryID);
+                $this->_queryID = -1;
+                // Move to the next recordset, or return false if there is none. In a stored proc
+                // call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
+                // returns false. I think this is because the last "recordset" is actually just the
+                // return value of the stored proc (ie the number of rows affected).
+                if(!mysqli_next_result($this->connection->_connectionID)) {
+                return false;
+                }
+                // CD: There is no $this->_connectionID variable, at least in the ADO version I'm using
+                $this->_queryID = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->connection->_connectionID )
+                                                : @mysqli_use_result( $this->connection->_connectionID );
+                if(!$this->_queryID) {
+                        return false;
+                }
+                $this->_inited = false;
+                $this->bind = false;
+                $this->_currentRow = -1;
+                $this->Init();
+                return true;
+        }
+
         // 10% speedup to move MoveNext to child class
         // This is the only implementation that works now (23-10-2003).
@@ -890 +1023 @@
         function _close() 
         {
+            //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
+        //only a problem with persistant connections
+
+        while(mysqli_more_results($this->connection->_connectionID)){
+           @mysqli_next_result($this->connection->_connectionID);
+        }
+
                 mysqli_free_result($this->_queryID); 
                 $this->_queryID = false;        
@@ -943 +1083 @@
                 
                 case MYSQLI_TYPE_TINY_BLOB :
-                case MYSQLI_TYPE_CHAR :
+                #case MYSQLI_TYPE_CHAR :
                 case MYSQLI_TYPE_STRING :
                 case MYSQLI_TYPE_ENUM :
@@ -1023 +1163 @@
 }
 
+class ADORecordSet_array_mysqli extends ADORecordSet_array {
+  
+  function ADORecordSet_array_mysqli($id=-1,$mode=false) 
+  {
+    $this->ADORecordSet_array($id,$mode);
+  }
+  
+        function MetaType($t, $len = -1, $fieldobj = false)
+        {
+                if (is_object($t)) {
+                    $fieldobj = $t;
+                    $t = $fieldobj->type;
+                    $len = $fieldobj->max_length;
+                }
+                
+                
+                 $len = -1; // mysql max_length is not accurate
+                 switch (strtoupper($t)) {
+                 case 'STRING': 
+                 case 'CHAR':
+                 case 'VARCHAR': 
+                 case 'TINYBLOB': 
+                 case 'TINYTEXT': 
+                 case 'ENUM': 
+                 case 'SET': 
+                
+                case MYSQLI_TYPE_TINY_BLOB :
+                #case MYSQLI_TYPE_CHAR :
+                case MYSQLI_TYPE_STRING :
+                case MYSQLI_TYPE_ENUM :
+                case MYSQLI_TYPE_SET :
+                case 253 :
+                   if ($len <= $this->blobSize) return 'C';
+                   
+                case 'TEXT':
+                case 'LONGTEXT': 
+                case 'MEDIUMTEXT':
+                   return 'X';
+                
+                
+                   // php_mysql extension always returns 'blob' even if 'text'
+                   // so we have to check whether binary...
+                case 'IMAGE':
+                case 'LONGBLOB': 
+                case 'BLOB':
+                case 'MEDIUMBLOB':
+                
+                case MYSQLI_TYPE_BLOB :
+                case MYSQLI_TYPE_LONG_BLOB :
+                case MYSQLI_TYPE_MEDIUM_BLOB :
+                
+                   return !empty($fieldobj->binary) ? 'B' : 'X';
+                case 'YEAR':
+                case 'DATE': 
+                case MYSQLI_TYPE_DATE :
+                case MYSQLI_TYPE_YEAR :
+                
+                   return 'D';
+                
+                case 'TIME':
+                case 'DATETIME':
+                case 'TIMESTAMP':
+                
+                case MYSQLI_TYPE_DATETIME :
+                case MYSQLI_TYPE_NEWDATE :
+                case MYSQLI_TYPE_TIME :
+                case MYSQLI_TYPE_TIMESTAMP :
+                
+                        return 'T';
+                
+                case 'INT': 
+                case 'INTEGER':
+                case 'BIGINT':
+                case 'TINYINT':
+                case 'MEDIUMINT':
+                case 'SMALLINT': 
+                
+                case MYSQLI_TYPE_INT24 :
+                case MYSQLI_TYPE_LONG :
+                case MYSQLI_TYPE_LONGLONG :
+                case MYSQLI_TYPE_SHORT :
+                case MYSQLI_TYPE_TINY :
+                
+                   if (!empty($fieldobj->primary_key)) return 'R';
+                   
+                   return 'I';
+                
+                
+                   // Added floating-point types
+                   // Maybe not necessery.
+                 case 'FLOAT':
+                 case 'DOUBLE':
+                   //           case 'DOUBLE PRECISION':
+                 case 'DECIMAL':
+                 case 'DEC':
+                 case 'FIXED':
+                 default:
+                        //if (!is_numeric($t)) echo "<p>--- Error in type matching $t -----</p>"; 
+                        return 'N';
+                }
+        } // function
+  
+}
+
 ?>