[Phpgroupware-cvs] phpgwapi/inc class.schema_proc.inc.php, 1.2.2.3, 1.2.2.4 class.schema_proc_mssql.inc.php, 1.2.2.2, 1.2.2.3 class.schema_proc_mysql.inc.php, 1.6.2.3, 1.6.2.4 class.schema_proc_pgsql.inc.php, 1.5.2.5, 1.5.2.6

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv8522

Modified Files:
      Tag: Version-0_9_16-branch
        class.schema_proc.inc.php class.schema_proc_mssql.inc.php 
        class.schema_proc_mysql.inc.php 
        class.schema_proc_pgsql.inc.php 
Log Message:
fixed uc and added ix support - might get to fk one day :)


Index: class.schema_proc_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc_pgsql.inc.php,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -d -r1.5.2.5 -r1.5.2.6
*** class.schema_proc_pgsql.inc.php     10 Oct 2003 08:38:30 -0000      1.5.2.5
--- class.schema_proc_pgsql.inc.php     1 Nov 2003 22:42:28 -0000       1.5.2.6
***************
*** 181,184 ****
--- 181,189 ----
                }
  
+               function GetIXSQL($sFields)
+               {
+                       return '';
+               }
+ 
                function _GetColumns($oProc, $sTableName, &$sColumns, 
$sDropColumn = '', $sAlteredColumn = '', $sAlteredColumnType = '')
                {

Index: class.schema_proc_mssql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc_mssql.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** class.schema_proc_mssql.inc.php     10 Oct 2003 08:38:29 -0000      1.2.2.2
--- class.schema_proc_mssql.inc.php     1 Nov 2003 22:42:28 -0000       1.2.2.3
***************
*** 195,198 ****
--- 195,203 ----
                }
  
+               function GetIXSQL($sFields)
+               {
+                       return '';
+               }
+ 
                function _GetColumns($oProc, $sTableName, &$sColumns, 
$sDropColumn = '')
                {

Index: class.schema_proc.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc.inc.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** class.schema_proc.inc.php   10 Oct 2003 08:38:28 -0000      1.2.2.3
--- class.schema_proc.inc.php   1 Nov 2003 22:42:28 -0000       1.2.2.4
***************
*** 296,299 ****
--- 296,300 ----
                        $sUCSQL = '';
                        $sPKSQL = '';
+                       $sIXSQL = '';
  
                        if(count($aTableDef['pk']) > 0)
***************
*** 323,326 ****
--- 324,340 ----
                        }
  
+                       if(count($aTableDef['ix']) > 0)
+                       {
+                               if(!$this->_GetIX($aTableDef['ix'], $sIXSQL))
+                               {
+                                       if($bOutputHTML)
+                                       {
+                                               echo '<br>Failed generating 
indexes<br>';
+                                       }
+ 
+                                       return False;
+                               }
+                       }
+ 
                        if($sPKSQL != '')
                        {
***************
*** 438,442 ****
                        $sFields = '';
                        reset($aFields);
!                       while(list($key,$sField) = each($aFields))
                        {
                                if($sFields != '')
--- 452,456 ----
                        $sFields = '';
                        reset($aFields);
!                       foreach($aFields as $key => $sField)
                        {
                                if($sFields != '')
***************
*** 444,447 ****
--- 458,466 ----
                                        $sFields .= ',';
                                }
+                               
+                               if(is_array($sField))
+                               {
+                                       $sField = implode(',', $sField);
+                               }
                                $sFields .= $sField;
                        }
***************
*** 449,452 ****
--- 468,495 ----
                        $sUCSQL = $this->m_oTranslator->GetUCSQL($sFields);
  
+                       return True;
+               }
+ 
+               function _GetIX($aFields, &$sIXSQL)
+               {
+                       $sIXSQL = '';
+                       if(count($aFields) < 1)
+                       {
+                               return True;
+                       }
+ 
+                       $sFields = '';
+                       reset($aFields);
+                       foreach($aFields as $key => $sField)
+                       {
+                               if(@is_array($sField))
+                               {
+                                       $sIXSQL .= 
$this->m_oTranslator->GetIXSQL(implode(',', $sField));
+                               }
+                               else
+                               {
+                                       $sIXSQL .= 
$this->m_oTranslator->GetIXSQL($sField);
+                               }
+                       }
                        return True;
                }

Index: class.schema_proc_mysql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc_mysql.inc.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** class.schema_proc_mysql.inc.php     10 Oct 2003 08:38:29 -0000      1.6.2.3
--- class.schema_proc_mysql.inc.php     1 Nov 2003 22:42:28 -0000       1.6.2.4
***************
*** 202,205 ****
--- 202,210 ----
                }
  
+               function GetIXSQL($sFields)
+               {
+                       return "INDEX ($sFeilds)";
+               }
+ 
                function _GetColumns($oProc, $sTableName, &$sColumns, 
$sDropColumn = '')
                {