Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-odbc.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-odbc.inc.php (modified) (13 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-odbc.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, 
@@ -53 +53 @@
                 if (!function_exists('odbc_connect')) return null;
                 
-                if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
-                        ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
-                }
+                if (!empty($argDatabasename) && stristr($argDSN, 'Database=') === false) {
+                        $argDSN = trim($argDSN);
+                        $endDSN = substr($argDSN, strlen($argDSN) - 1);
+                        if ($endDSN != ';') $argDSN .= ';';
+                        $argDSN .= 'Database='.$argDatabasename;
+                }
+                
                 if (isset($php_errormsg)) $php_errormsg = '';
                 if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
@@ -162 +166 @@
                                 $this->genID = $num;
                                 return $num;
+                        } elseif ($this->affected_rows() == 0) {
+                                // some drivers do not return a valid value => try with another method
+                                $value = $this->GetOne("select id from $seq");
+                                if ($value == $num + 1) {
+                                        return $value;
+                                }
                         }
                 }
@@ -253 +263 @@
                 $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
                 
-                $arr =& $rs->GetArray();
+                $arr = $rs->GetArray();
                 $rs->Close();
                 //print_r($arr);
@@ -265 +275 @@
         
         
-        function &MetaTables($ttype=false)
+        function MetaTables($ttype=false)
         {
         global $ADODB_FETCH_MODE;
@@ -282 +292 @@
                 $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
                 
-                $arr =& $rs->GetArray();
+                $arr = $rs->GetArray();
                 //print_r($arr);
                 
@@ -371 +381 @@
         }
         
-        function &MetaColumns($table)
+        function MetaColumns($table, $normalize=true)
         {
         global $ADODB_FETCH_MODE;
@@ -423 +433 @@
                 if (empty($qid)) return $false;
                 
-                $rs =& new ADORecordSet_odbc($qid);
+                $rs = new ADORecordSet_odbc($qid);
                 $ADODB_FETCH_MODE = $savem;
                 
@@ -615 +625 @@
 
         // returns the field object
-        function &FetchField($fieldOffset = -1) 
+        function FetchField($fieldOffset = -1) 
         {
                 
@@ -662 +672 @@
         
         // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
-        function &GetArrayLimit($nrows,$offset=-1) 
+        function GetArrayLimit($nrows,$offset=-1) 
         {
                 if ($offset <= 0) {
-                        $rs =& $this->GetArray($nrows);
+                        $rs = $this->GetArray($nrows);
                         return $rs;
                 }
@@ -674 +684 @@
                 
                 if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                        $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+                        $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
                 }
                 
@@ -701 +711 @@
                         if ($rez) {
                                 if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                                        $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+                                        $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
                                 }
                                 return true;
@@ -722 +732 @@
                 if ($rez) {
                         if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                                $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+                                $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
                         }
                         return true;