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

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-datadict.inc.php

@@ -2 +2 @@
 
 /**
-  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, 
@@ -216 +216 @@
         }
         
-
         function MetaType($t,$len=-1,$fieldobj=false)
         {               
@@ -232 +231 @@
                 'INTERVAL' => 'C',  # Postgres
                 'MACADDR' => 'C', # postgres
+                'VAR_STRING' => 'C', # mysql
                 ##
                 'LONGCHAR' => 'X',
@@ -259 +259 @@
                 'DATETIME' => 'T',
                 'TIMESTAMPTZ' => 'T',
+                'SMALLDATETIME' => 'T',
                 'T' => 'T',
                 'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
@@ -370 +371 @@
         {
                 $rez = 2;
-                $conn = &$this->connection;
+                $conn = $this->connection;
                 $saved = $conn->debug;
                 foreach($sql as $line) {
@@ -519 +520 @@
                         if ($lines == null) $lines = array();
                         list(,$first) = each($lines);
-                        list(,$column_def) = preg_split('/[\t ]+/',$first,2);
+                        list(,$column_def) = preg_split("/[\t ]+/",$first,2);
                 }
                 return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
@@ -589 +590 @@
                 return $sql;
         }
+                
+        
         
         function _GenFields($flds,$widespacing=false)
@@ -814 +817 @@
         
         // return string must begin with space
-        function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+        function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
         {       
                 $suffix = '';
@@ -913 +916 @@
         }
         
+        
+        function _getSizePrec($size)
+        {
+                $fsize = false;
+                $fprec = false;
+                $dotat = strpos($size,'.');
+                if ($dotat === false) $dotat = strpos($size,',');
+                if ($dotat === false) $fsize = $size;
+                else {
+                        $fsize = substr($size,0,$dotat);
+                        $fprec = substr($size,$dotat+1);
+                }
+                return array($fsize, $fprec);
+        }
+        
         /**
         "Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
@@ -919 +937 @@
         have to know if the col is new or not. It will check on its own.
         */
-        function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+        function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false)
         {
         global $ADODB_FETCH_MODE;
@@ -952 +970 @@
                                         if (isset($obj->not_null) && $obj->not_null)
                                                 $v = str_replace('NOT NULL','',$v);
-
+                                        if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) 
+                                            $v = str_replace('AUTOINCREMENT','',$v);
+                                        
                                         $c = $cols[$k];
                                         $ml = $c->max_length;
                                         $mt = $this->MetaType($c->type,$ml);
+                                        
+                                        if (isset($c->scale)) $sc = $c->scale;
+                                        else $sc = 99; // always force change if scale not known.
+                                        
+                                        if ($sc == -1) $sc = false;
+                                        list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']);
+
                                         if ($ml == -1) $ml = '';
                                         if ($mt == 'X') $ml = $v['SIZE'];
-                                        if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+                                        if (($mt != $v['TYPE']) || ($ml != $fsize || $sc != $fprec) || (isset($v['AUTOINCREMENT']) && $v['AUTOINCREMENT'] != $obj->auto_increment)) {
                                                 $holdflds[$k] = $v;
                                         }
@@ -982 +1009 @@
                                 
                                 //  We are trying to change the size of the field, if not allowed, simply ignore the request.
-                                if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) {
-                                        echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
+                                // $flds[1] holds the type, $flds[2] holds the size -postnuke addition
+                                if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)
+                                 && (isset($flds[0][2]) && is_numeric($flds[0][2]))) {
+                                        if ($this->debug) ADOConnection::outp(sprintf("<h3>%s cannot be changed to %s currently</h3>", $flds[0][0], $flds[0][1]));
+                                        #echo "<h3>$this->alterCol cannot be changed to $flds currently</h3>";
                                         continue;        
                                 }
@@ -992 +1022 @@
                 }
                 
+                if ($dropOldFlds) {
+                        foreach ( $cols as $id => $v )
+                            if ( !isset($lines[$id]) ) 
+                                        $sql[] = $alter . $this->dropCol . ' ' . $v->name;
+                }
                 return $sql;
         }