[Vtigercrm-commits] [vtiger development] #752: Add postgresql support to trunk

[vtiger development]

#752: Add postgresql support to trunk
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer                
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.0                    
Resolution:             |    Keywords:  adodb postgresql database
------------------------+---------------------------------------------------
Comment (by jeffk):

 Since [5890] had a conflict with the trunk, I'll document resolution
 procedure here:
 {{{
 $ svn merge -r 5863:HEAD
 http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/trunk
 U    Smarty/templates/Importerror.tpl
 U    Smarty/templates/Header.tpl
 U    Smarty/templates/DetailViewHidden.tpl
 U    Smarty/templates/DetailView.tpl
 U    Smarty/templates/ListView.tpl
 U    Smarty/templates/GroupDetailview.tpl
 U    Smarty/templates/Buttons_List.tpl
 U    Smarty/templates/ListViewEntries.tpl
 U    Smarty/templates/CustomView.tpl
 A    modules/Portal/Portal.php
 U    modules/Portal/Popup.php
 U    modules/CustomView/language/en_us.lang.php
 U    modules/CustomView/CustomView.php
 U    modules/Rss/ListView.php
 U    modules/Rss/Rss.php
 U    modules/Calendar/Appointment.php
 U    modules/Calendar/Calendar.php
 U    modules/Calendar/script.js
 C    modules/Calendar/calendarLayout.php      (CONFLICTING LINES)
 U    modules/Calendar/Date.php
 U    modules/Calendar/addEventUI.php
 U    modules/Import/ImportStep3.php
 U    modules/Import/ImportSteplast.php
 U    modules/Import/language/en_us.lang.php
 U    include/language/en_us.lang.php
 U    include/js/search.js
 U    include/js/ListView.js
 U    index.php
 U    soap/contactserialize.php
 }}}
 You can't commit until you resolve the conflict:
 {{{
 $ svn commit -m '...'
 svn: Commit failed (details follow):
 svn: Aborting commit:
 '/software/vtigercrm50/modules/Calendar/calendarLayout.php' remains in
 conflict
 }}}
 Open your editor for modules/Calendar/calendarLayout.php and choose
 between the following:
 {{{
 <<<<<<< .working
         $query = "SELECT cntactivityrel.contactid, activity.*
                 FROM activity
                 INNER JOIN crmentity
                         ON crmentity.crmid = activity.activityid
                 LEFT JOIN cntactivityrel
                         ON cntactivityrel.activityid = activity.activityid
                 LEFT OUTER JOIN recurringevents
                         ON recurringevents.activityid =
 activity.activityid
                 WHERE crmentity.deleted = 0
                         AND (activity.activitytype = 'Meeting' OR
 activity.activitytype = 'Call')
                         AND (activity.date_start BETWEEN '".$start_date."'
 AND '".$end_date."'
                                 OR activity.due_date BETWEEN
 '".$start_date."' AND '".$end_date."'
                                 OR recurringevents.recurringdate BETWEEN
 '".$start_date."' AND '".$end_date."')";
 =======
         $query = "select groups.groupname
 ,users.user_name,activity.activitytype,activity.subject,crmentity.smownerid,seactivityrel.crmid,cntactivityrel.contactid
 ,crmentity.crmid,activity.* from activity inner join crmentity on
 crmentity.crmid=activity.activityid left join cntactivityrel on
 cntactivityrel.activityid= activity.activityid left join contactdetails on
 contactdetails.contactid= cntactivityrel.contactid left join seactivityrel
 on seactivityrel.activityid = activity.activityid left join
 activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid
 left join groups on groups.groupname=activitygrouprelation.groupname left
 join users on users.id=crmentity.smownerid left outer join account on
 account.accountid = contactdetails.accountid left outer join
 recurringevents on recurringevents.activityid=activity.activityid WHERE
 crmentity.deleted=0 and (activity.activitytype = 'Meeting' or
 activity.activitytype='Call' or activity.activitytype='Task') and
 (activity.activitytype != 'Task') and (activity.date_start between
 '".$start_date."' and '".$end_date."' or recurringevents.recurringdate
 between '".$start_date."' and '".$end_date."')";
 >>>>>>> .merge-right.r5889
 }}}
 Tell subversion that you've manually resolved the conflicted file:
 {{{
 $ svn resolved modules/Calendar/calendarLayout.php
 Resolved conflicted state of 'modules/Calendar/calendarLayout.php'
 }}}
 {{{
 $ svn commit -m '...'
 }}}
 Remerge [5889] to your working , just to confirm that [5890] didn't
 supercede any of [5889].
 {{{
 $ svn merge -r 5888:5889
 http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/5.0_postgresql_integration
 }}}
 If the diff is zero, then allan's changes are safe, and there's no need
 for another commit.
 {{{
 $ svn diff
 }}}
 (diff is zero)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/752>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM