Changeset 34 for trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php (modified) (6 diffs)

trunk/phpgwapi/inc/adodb/datadict/datadict-mysql.inc.php

@@ -2 +2 @@
 
 /**
-  V4.51 29 July 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -21 +21 @@
         
         var $dropIndex = 'DROP INDEX %s ON %s';
+        var $renameColumn = 'ALTER TABLE %s CHANGE COLUMN %s %s %s';    // needs column-definition!
         
         function MetaType($t,$len=-1,$fieldobj=false)
@@ -29 +30 @@
                         $len = $fieldobj->max_length;
                 }
+                $is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
                 
                 $len = -1; // mysql max_length is not accurate
@@ -66 +68 @@
                         
                 case 'INT': 
-                case 'INTEGER': return (!empty($fieldobj->primary_key)) ? 'R' : 'I';
-                case 'TINYINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I1';
-                case 'SMALLINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I2';
-                case 'MEDIUMINT': return (!empty($fieldobj->primary_key)) ? 'R' : 'I4';
-                case 'BIGINT':  return (!empty($fieldobj->primary_key)) ? 'R' : 'I8';
+                case 'INTEGER': return $is_serial ? 'R' : 'I';
+                case 'TINYINT': return $is_serial ? 'R' : 'I1';
+                case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+                case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+                case 'BIGINT':  return $is_serial ? 'R' : 'I8';
                 default: return 'N';
                 }
@@ -79 +81 @@
                 switch(strtoupper($meta)) {
                 case 'C': return 'VARCHAR';
-                case 'XL':
-                case 'X': return 'LONGTEXT';
+                case 'XL':return 'LONGTEXT';
+                case 'X': return 'TEXT';
                 
                 case 'C2': return 'VARCHAR';
@@ -92 +94 @@
                 
                 case 'R':
+                case 'I4':
                 case 'I': return 'INTEGER';
                 case 'I1': return 'TINYINT';
                 case 'I2': return 'SMALLINT';
-                case 'I4': return 'MEDIUMINT';
                 case 'I8': return 'BIGINT';