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

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-sqlite.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, 
@@ -79 +79 @@
         
         // mark newnham
-        function &MetaColumns($tab)
+        function MetaColumns($table, $normalize=true) 
         {
           global $ADODB_FETCH_MODE;
@@ -86 +86 @@
           $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
           if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
-          $rs = $this->Execute("PRAGMA table_info('$tab')");
+          $rs = $this->Execute("PRAGMA table_info('$table')");
           if (isset($savem)) $this->SetFetchMode($savem);
           if (!$rs) {
@@ -105 +105 @@
             $fld->not_null = $r['notnull'];
             $fld->default_value = $r['dflt_value'];
-            $fld->scale = 0;
+            $fld->scale = 0;    
+                if (isset($r['pk']) && $r['pk']) $fld->primary_key=1;
             if ($save == ADODB_FETCH_NUM) $arr[] = $fld;        
             else $arr[strtoupper($fld->name)] = $fld;
@@ -191 +192 @@
         }
         
-        function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+        function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
         {
                 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
                 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
                 if ($secs2cache)
-                        $rs =& $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+                        $rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
                 else
-                        $rs =& $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+                        $rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
                         
                 return $rs;
@@ -262 +263 @@
         }
 
-        function &MetaIndexes($table, $primary = FALSE, $owner=false)
+        function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
         {
                 $false = false;
@@ -351 +352 @@
 
 
-        function &FetchField($fieldOffset = -1)
+        function FetchField($fieldOffset = -1)
         {
                 $fld = new ADOFieldObject;