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

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-ado.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, 
@@ -148 +148 @@
 */
         
-        function &MetaTables()
+        function MetaTables()
         {
                 $arr= array();
@@ -170 +170 @@
         }
         
-        function &MetaColumns($table)
+        function MetaColumns($table, $normalize=true)
         {
                 $table = strtoupper($table);
@@ -205 +205 @@
         
         /* returns queryID or false */
-        function &_query($sql,$inputarr=false) 
+        function _query($sql,$inputarr=false) 
         {
                 
@@ -222 +222 @@
                         $oCmd->CommandType = 1;
 
-                        foreach($inputarr as $val) {
+      // Map by http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ado270/htm/mdmthcreateparam.asp
+      // Check issue http://bugs.php.net/bug.php?id=40664 !!!
+                        while(list(, $val) = each($inputarr)) {
+                                $type = gettype($val);
+                                $len=strlen($val);
+                                if ($type == 'boolean')
+                                        $this->adoParameterType = 11;
+                                else if ($type == 'integer')
+                                        $this->adoParameterType = 3;
+                                else if ($type == 'double')
+                                        $this->adoParameterType = 5;
+                                elseif ($type == 'string')
+                                        $this->adoParameterType = 202;
+                                else if (($val === null) || (!defined($val)))
+                                        $len=1;
+                                else
+                                        $this->adoParameterType = 130;
+                                
                                 // name, type, direction 1 = input, len,
-                                $this->adoParameterType = 130;
-                                $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,strlen($val),$val);
-                                //print $p->Type.' '.$p->value;
+                        $p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
+
                                 $oCmd->Parameters->Append($p);
                         }
@@ -338 +354 @@
 
         // returns the field object
-        function &FetchField($fieldOffset = -1) {
+        function FetchField($fieldOffset = -1) {
                 $off=$fieldOffset+1; // offsets begin at 1
                 
@@ -588 +604 @@
                                 $this->fields[] = (float) $f->value;
                                 break;
+                        case 11: //BIT;
+                                $val = "";
+                                if(is_bool($f->value))  {
+                                        if($f->value==true) $val = 1;
+                                        else $val = 0;
+                                }
+                                if(is_null($f->value)) $val = null;
+                                
+                                $this->fields[] = $val;
+                                break;
                         default:
                                 $this->fields[] = $f->value; 
@@ -600 +626 @@
                 
                 if ($this->fetchMode & ADODB_FETCH_ASSOC) {
-                        $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                        $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
                 }
                 return true;