[Phpgroupware-cvs] phpgwapi/inc class.schema_proc.inc.php, 1.2.2.2, 1.2.2.3 class.schema_proc_array.inc.php, 1.2.2.1, 1.2.2.2 class.schema_proc_mssql.inc.php, 1.2.2.1, 1.2.2.2 class.schema_proc_mysql.inc.php, 1.6.2.2, 1.6.2.3 class.schema_proc_pgsql.inc.php, 1.5.2.4, 1.5.2.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.schema_proc.inc.php class.schema_proc_array.inc.php 
        class.schema_proc_mssql.inc.php 
        class.schema_proc_mysql.inc.php 
        class.schema_proc_pgsql.inc.php 
Log Message:
kai's schema proc changes to support SAPDB


Index: class.schema_proc_array.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc_array.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** class.schema_proc_array.inc.php     27 Mar 2003 00:00:39 -0000      1.2.2.1
--- class.schema_proc_array.inc.php     10 Oct 2003 08:38:29 -0000      1.2.2.2
***************
*** 33,37 ****
                function TranslateDefault($sDefault)
                {
!                       return $sDefault;
                }
  
--- 33,37 ----
                function TranslateDefault($sDefault)
                {
!                       return "'" . $sDefault . "'";
                }
  
***************
*** 67,71 ****
                                unset($aTables[$sTableName]);
                        }
!                       
                        return True;
                }
--- 67,71 ----
                                unset($aTables[$sTableName]);
                        }
! 
                        return True;
                }
***************
*** 180,184 ****
  
                        return True;
!               }       
        }
  ?>
--- 180,184 ----
  
                        return True;
!               }
        }
  ?>

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.4
retrieving revision 1.5.2.5
diff -C2 -d -r1.5.2.4 -r1.5.2.5
*** class.schema_proc_pgsql.inc.php     10 Sep 2003 22:37:30 -0000      1.5.2.4
--- class.schema_proc_pgsql.inc.php     10 Oct 2003 08:38:30 -0000      1.5.2.5
***************
*** 102,108 ****
                                case 'current_date':
                                case 'current_timestamp':
!                                       return 'now';
                        }
!                       return $sDefault;
                }
  
--- 102,108 ----
                                case 'current_date':
                                case 'current_timestamp':
!                                       return "'now'";
                        }
!                       return "'" . $sDefault . "'";
                }
  
***************
*** 276,282 ****
                                $sql_get_default = "
                                        SELECT d.adsrc AS rowdefault
!                                               FROM pg_attrdef d, pg_class c 
!                                               WHERE 
!                                                       c.relname = 
'$sTableName' AND 
                                                        c.oid = d.adrelid AND
                                                        d.adnum = $colnum
--- 276,282 ----
                                $sql_get_default = "
                                        SELECT d.adsrc AS rowdefault
!                                               FROM pg_attrdef d, pg_class c
!                                               WHERE
!                                                       c.relname = 
'$sTableName' AND
                                                        c.oid = d.adrelid AND
                                                        d.adnum = $colnum
***************
*** 307,317 ****
                        }
                        $sql_pri_keys = "
!                               SELECT 
!                                       ic.relname AS index_name, 
!                                       bc.relname AS tab_name, 
                                        ta.attname AS column_name,
                                        i.indisunique AS unique_key,
                                        i.indisprimary AS primary_key
!                               FROM 
                                        pg_class bc,
                                        pg_class ic,
--- 307,317 ----
                        }
                        $sql_pri_keys = "
!                               SELECT
!                                       ic.relname AS index_name,
!                                       bc.relname AS tab_name,
                                        ta.attname AS column_name,
                                        i.indisunique AS unique_key,
                                        i.indisprimary AS primary_key
!                               FROM
                                        pg_class bc,
                                        pg_class ic,
***************
*** 319,323 ****
                                        pg_attribute ta,
                                        pg_attribute ia
!                               WHERE 
                                        bc.oid = i.indrelid
                                        AND ic.oid = i.indexrelid
--- 319,323 ----
                                        pg_attribute ta,
                                        pg_attribute ia
!                               WHERE
                                        bc.oid = i.indrelid
                                        AND ic.oid = i.indexrelid
***************
*** 327,331 ****
                                        AND ta.attrelid = i.indrelid
                                        AND ta.attnum = i.indkey[ia.attnum-1]
!                               ORDER BY 
                                        index_name, tab_name, column_name";
                        $sdc->query($sql_pri_keys);
--- 327,331 ----
                                        AND ta.attrelid = i.indrelid
                                        AND ta.attnum = i.indkey[ia.attnum-1]
!                               ORDER BY
                                        index_name, tab_name, column_name";
                        $sdc->query($sql_pri_keys);
***************
*** 605,609 ****
  
                                $query .= "UPDATE $sTableName SET 
$sColumnName='$default';\n";
!                               
                                $Ok = !!($oProc->m_odb->query($query));
  
--- 605,609 ----
  
                                $query .= "UPDATE $sTableName SET 
$sColumnName='$default';\n";
! 
                                $Ok = !!($oProc->m_odb->query($query));
  

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.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** class.schema_proc_mssql.inc.php     27 Mar 2003 00:00:39 -0000      1.2.2.1
--- class.schema_proc_mssql.inc.php     10 Oct 2003 08:38:29 -0000      1.2.2.2
***************
*** 108,115 ****
                                case 'current_date':
                                case 'current_timestamp':
!                               return 'GetDate()';
                        }
  
!                       return $sDefault;
                }
  
--- 108,115 ----
                                case 'current_date':
                                case 'current_timestamp':
!                               return "'GetDate()'";
                        }
  
!                       return "'" . $sDefault . "'";
                }
  

Index: class.schema_proc.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.schema_proc.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.inc.php   1 Aug 2003 17:01:11 -0000       1.2.2.2
--- class.schema_proc.inc.php   10 Oct 2003 08:38:28 -0000      1.2.2.3
***************
*** 389,393 ****
                                        // Get default DDL - useful for 
differences in date defaults (eg, now() vs. getdate())
                                        $sTranslatedDefault = 
$this->m_oTranslator->TranslateDefault($sDefault);
!                                       $sFieldSQL .= " DEFAULT 
'$sTranslatedDefault'";
                                }
                                elseif($sDefault == '0')
--- 389,393 ----
                                        // Get default DDL - useful for 
differences in date defaults (eg, now() vs. getdate())
                                        $sTranslatedDefault = 
$this->m_oTranslator->TranslateDefault($sDefault);
!                                       $sFieldSQL .= " DEFAULT 
$sTranslatedDefault";
                                }
                                elseif($sDefault == '0')

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.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** class.schema_proc_mysql.inc.php     5 May 2003 19:31:03 -0000       1.6.2.2
--- class.schema_proc_mysql.inc.php     10 Oct 2003 08:38:29 -0000      1.6.2.3
***************
*** 112,118 ****
                                case 'current_date':
                                case 'current_timestamp':
!                                       return 'now';
                        }
!                       return $sDefault;
                }
  
--- 112,118 ----
                                case 'current_date':
                                case 'current_timestamp':
!                                       return "'now'";
                        }
!                       return "'" . $sDefault . "'";
                }
  
***************
*** 209,213 ****
                        $this->ix = array();
                        $this->uc = array();
!                       
                        /* Field, Type, Null, Key, Default, Extra */
                        $oProc->m_odb->query("describe $sTableName");
--- 209,213 ----
                        $this->ix = array();
                        $this->uc = array();
! 
                        /* Field, Type, Null, Key, Default, Extra */
                        $oProc->m_odb->query("describe $sTableName");
***************
*** 360,364 ****
  
                        return false;
!               }       
        }
  ?>
--- 360,364 ----
  
                        return false;
!               }
        }
  ?>