Changeset 34 for trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.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-oci8.inc.php (modified) (7 diffs)

trunk/phpgwapi/inc/adodb/datadict/datadict-oci8.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 $dropTable = "DROP TABLE %s CASCADE CONSTRAINTS";
         var $trigPrefix = 'TRIG_';
+        var $alterCol = ' MODIFY ';
+        var $typeX = 'VARCHAR(4000)';
+        var $typeXL = 'CLOB';
         
         function MetaType($t,$len=-1)
@@ -70 +73 @@
                 switch($meta) {
                 case 'C': return 'VARCHAR';
-                case 'X': return 'VARCHAR(4000)';
-                case 'XL': return 'CLOB';
-                
-                case 'C2': return 'NVARCHAR';
-                case 'X2': return 'NVARCHAR(2000)';
+                case 'X': return $this->typeX;
+                case 'XL': return $this->typeXL;
+                
+                case 'C2': return 'NVARCHAR2';
+                case 'X2': return 'NVARCHAR2(4000)';
                 
                 case 'B': return 'BLOB';
@@ -114 +117 @@
                 }
                 
-                $s .= implode(',',$f).')';
+                $s .= implode(', ',$f).')';
                 $sql[] = $s;
                 return $sql;
@@ -127 +130 @@
                         $f[] = "\n $v";
                 }
-                $s .= implode(',',$f).')';
+                $s .= implode(', ',$f).')';
                 $sql[] = $s;
                 return $sql;
@@ -135 +138 @@
         {
                 if (!is_array($flds)) $flds = explode(',',$flds);
+                foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
+                
                 $sql = array();
                 $s = "ALTER TABLE $tabname DROP(";
-                $s .= implode(',',$flds).') CASCADE COSTRAINTS';
+                $s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
                 $sql[] = $s;
                 return $sql;
@@ -192 +197 @@
                         $trigname = $this->trigPrefix.$seqname;
                 }
+                
+                if (strlen($seqname) > 30) {
+                        $seqname = $this->seqPrefix.uniqid('');
+                } // end if
+                if (strlen($trigname) > 30) {
+                        $trigname = $this->trigPrefix.uniqid('');
+                } // end if
+
                 if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
                 $seqCache = '';