[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.3, 1.17.2.2.2.4 class.sql.inc.php, 1.1.2.1, 1.1.2.2 class.sql_builder.inc.php, 1.1.2.1, 1.1.2.2 class.sql_entity.inc.php, 1.1.2.2, 1.1.2.3

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php class.sql.inc.php 
        class.sql_builder.inc.php class.sql_entity.inc.php 
Log Message:
various bug fixes from eald


Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.3
retrieving revision 1.17.2.2.2.4
diff -C2 -r1.17.2.2.2.3 -r1.17.2.2.2.4
*** class.contacts_sql.inc.php  10 Sep 2003 22:37:30 -0000      1.17.2.2.2.3
--- class.contacts_sql.inc.php  10 Sep 2003 23:58:01 -0000      1.17.2.2.2.4
***************
*** 742,746 ****
                        
                        $sql = $this->get_sql();
!                       
                        if ($limit)
                        {
--- 742,746 ----
                        
                        $sql = $this->get_sql();
! 
                        if ($limit)
                        {

Index: class.sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.sql.inc.php   8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.sql.inc.php   10 Sep 2003 23:58:01 -0000      1.1.2.2
***************
*** 165,169 ****
                function and_($left, $right)
                {
!                       return ' ('.$left.') AND ('.$right.') ';
                }
  
--- 165,169 ----
                function and_($left, $right)
                {
!                       return ' (('.$left.') AND ('.$right.')) ';
                }
  
***************
*** 177,181 ****
                function or_($left, $right)
                {
!                       return ' ('.$left.') OR ('.$right.') ';
                }
  
--- 177,181 ----
                function or_($left, $right)
                {
!                       return ' (('.$left.') OR ('.$right.')) ';
                }
  

Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_builder.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.sql_builder.inc.php   8 Sep 2003 13:26:38 -0000       1.1.2.1
--- class.sql_builder.inc.php   10 Sep 2003 23:58:01 -0000      1.1.2.2
***************
*** 362,365 ****
--- 362,366 ----
                                $sql = $this->set_order($sql);
                                unset($this->order_string);
+                               $this->ldebug('SQL', array('SQL String' => 
$sql));
                                return $sql;
                        }
***************
*** 1101,1105 ****
  //                          ($myfoo == '')) xor
  //                        ($myfoo == ''))
! //                    if ($myfoo != 'closer_entity')
  //                    {
                        return;
--- 1102,1106 ----
  //                          ($myfoo == '')) xor
  //                        ($myfoo == ''))
! //                    if ($myfoo != 'SQL')
  //                    {
                        return;

Index: class.sql_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_entity.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.sql_entity.inc.php    10 Sep 2003 22:37:30 -0000      1.1.2.2
--- class.sql_entity.inc.php    10 Sep 2003 23:58:01 -0000      1.1.2.3
***************
*** 504,507 ****
--- 504,508 ----
                * @param Array $data Fields that want change value and their 
values
                * @param Array $criteria With criterias that set the rows to 
edit
+               * @param integer action
                * @return string with sql update
                */
***************
*** 534,538 ****
                                        $sql = $this->return_update();
                                        $GLOBALS['phpgw']->db->query($sql, 
__LINE__, __FILE__);
!                                       $this->ldebug('update', 
$this->return_update(), 'msg');
                                        return;
                                case PHPGW_SQL_RETURN_SQL:
--- 535,539 ----
                                        $sql = $this->return_update();
                                        $GLOBALS['phpgw']->db->query($sql, 
__LINE__, __FILE__);
!                                       $this->ldebug('update', $sql, 'msg');
                                        return;
                                case PHPGW_SQL_RETURN_SQL:
***************
*** 562,565 ****
--- 563,567 ----
                        }
                        $this->values = '';
+                       $this->criteria = '';
                        return $sql_update;
                }
***************
*** 581,585 ****
                function set_update_data($element)
                {
!                       $value = ($element['value']) ? 
sql::string($element['value']) : sql::null();
                        $this->values .= (($this->values)?', 
':'').$element['real_field'].' = '.$value;
                }
--- 583,587 ----
                function set_update_data($element)
                {
!                       $value = ($element['value']) ? 
$this->cast($element['value'], $element['field']) : sql::null();
                        $this->values .= (($this->values)?', 
':'').$element['real_field'].' = '.$value;
                }
***************
*** 599,603 ****
                *
                * @param string $criteria the criteria for select the rows to 
delete
!               * @param integer $action SQL_RETURN | SQL_RUN
                * @return string which will be used for delete query.
                */
--- 601,605 ----
                *
                * @param string $criteria the criteria for select the rows to 
delete
!               * @param integer $action PHPGW_SQL_RETURN_SQL | 
PHPGW_SQL_RUN_SQL
                * @return string which will be used for delete query.
                */
***************
*** 942,946 ****
                function ldebug($myfoo, $data, $type = 'string', $err = '')
                {
! //                    if (!((($myfoo != 'single_insert') xor
  //                           ($myfoo != '')) xor
  //                          ($myfoo == '')) xor
--- 944,948 ----
                function ldebug($myfoo, $data, $type = 'string', $err = '')
                {
! //                    if (!((($myfoo != 'update') xor
  //                           ($myfoo != '')) xor
  //                          ($myfoo == '')) xor