Changeset 7433 for branches/2.4

Timestamp:

10/17/12 11:38:12 (12 years ago)

Author:

eduardow

Message:

Ticket #3164 - Corrigido problema na criação de eventos na agenda antiga.

Location:

branches/2.4/calendar

Files:

• inc/class.socalendar_sql.inc.php (modified) (1 diff)
• setup/tables_current.inc.php (modified) (1 diff)

branches/2.4/calendar/inc/class.socalendar_sql.inc.php

@@ -942 +942 @@
                                         $event['uid'] = $part[0].'-'.$part[1].'@'.$id_suffix;
                                 }
-                                $this->stream->query('INSERT INTO phpgw_cal(uid,title,owner,priority,is_public,category) '
+                                $returned_id = $this->stream->query('INSERT INTO phpgw_cal(uid,title,owner,priority,is_public,category) '
                                         . "values('".$event['uid']."','".$this->stream->db_addslashes($event['title'])
                                         . "',".(int)$event['owner'].','.(int)$event['priority'].','.(int)$event['public'].",'"
-                                        . $event['category']."')",__LINE__,__FILE__);
-                                $event['id'] = $this->stream->get_last_insert_id('phpgw_cal','cal_id');
+                                        . $event['category']."') RETURNING cal_id",__LINE__,__FILE__); 
+
+                // get_last_insert_id não funciona direito com Postgres 9 
+                $event['id'] =  $returned_id->fields['cal_id']; //$this->stream->get_last_insert_id('phpgw_cal','cal_id'); 
                                 $last_status = true;
                         }

branches/2.4/calendar/setup/tables_current.inc.php

@@ -32 +32 @@
                                 'observations' => array('type' => 'text','nullable' => True),
                                 'attachment' => array('type' => 'text','nullable' => True),
-                                'alter_by' => array('type' => 'varchar','precision' => '160','nullable' => True)
+                                'alter_by' => array('type' => 'varchar','precision' => '160','nullable' => True), 
+                'organizer' => array('type' => 'character varying','precision' => '255','nullable' => True), 
+                'last_status' => array('type' => 'character','precision' => '1','nullable' => True), 
+                'last_update' => array('type' => 'bigint','nullable' => True), 
+                'notifcations_owner' => array('type' => 'integer','nullable' => True) 
                         ),
                         'pk' => array('cal_id'),