[Vtigercrm-commits] [vtiger development] #62: add postgresql support to vtigercrm-4.2.x
vtiger development
vtiger-tickets at vtiger.fosslabs.com
Mon Apr 24 18:30:20 EDT 2006
#62: add postgresql support to vtigercrm-4.2.x
------------------------+---------------------------------------------------
Reporter: jeffk | Owner: jeffk
Type: defect | Status: new
Priority: major | Milestone: 4.2.5
Component: vtigercrm | Version:
Resolution: | Keywords: database postgresql adodb
------------------------+---------------------------------------------------
Comment (by jeffk):
(In [5306]) refs #62 and #17. merging
source:vtigercrm/branches/4.2_postgresql_integration back to
source:vtigercrm/branches/4.2. This closes the
postgresql_integration branch. Some work will remain to properly support
both mysql and postgresql (e.g. in
source:vtigercrm/branches/4.2/config.inc.php)
What follows is a journal of how this merge was performed:
My present working copy is:
$ svn info
Path: .
URL:
http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration
Repository Root: http://jeffk@vtiger.fosslabs.com/svn/vtiger
Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900
Revision: 5305
Node Kind: directory
Schedule: normal
Last Changed Author: jeffk
Last Changed Rev: 5114
Last Changed Date: 2006-04-13 19:47:22 -0400 (Thu, 13 Apr 2006)
Check that there are no changes in my working copy to commit:
$ svn diff
(there are none)
Check for late changes to the original (target) branch that I should merge
first:
$ svn diff -r 5113:HEAD
http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2
(there are none)
Switch my working copy to the original (target) branch. This is a good
preview of files affected by the coming merge of the two
branches.
$ svn switch
http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2
U config.inc.php
U sendreminder.php
U modules/Accounts/ListViewTop.php
U modules/Accounts/Account.php
U modules/Accounts/Popup_picker.php
U modules/Accounts/Popup.php
U modules/Accounts/ListView.php
U modules/Accounts/AccountFormBase.php
U modules/Quotes/Quote.php
U modules/Quotes/Delete.php
U modules/Quotes/Popup.php
U modules/Quotes/ListView.php
U modules/Potentials/Popup.php
U modules/Potentials/ListView.php
U modules/Potentials/Opportunity.php
U modules/Leads/Popup.php
U modules/Leads/Lead.php
U modules/Leads/ListView.php
U modules/Leads/LeadConvertToEntities.php
U modules/Home/UnifiedSearch.php
U modules/Notes/Delete.php
U modules/Notes/ListView.php
U modules/Invoice/Invoice.php
U modules/Invoice/ListView.php
U modules/Orders/SalesOrderListView.php
U modules/Orders/SalesOrder.php
U modules/Orders/Order.php
U modules/Orders/DeleteSalesOrder.php
U modules/Orders/PopupSalesOrder.php
U modules/Orders/ListView.php
U modules/Reports/ReportRun.php
U modules/Reports/SaveReportFolder.php
U modules/Reports/Save.php
U modules/Reports/Reports.php
U modules/Reports/PopulateReports.php
U modules/HelpDesk/HelpDesk.php
U modules/HelpDesk/FaqList.php
U modules/HelpDesk/ListView.php
U modules/Settings/SaveConvertLead.php
U modules/Settings/DeleteCustomField.php
U modules/Settings/UpdateComboValues.php
U modules/Users/User.php
U modules/Users/SaveProfile.php
U modules/Users/SaveOrgSharing.php
U modules/Users/massdelete.php
U modules/Users/LoginHistory.php
U modules/Users/saveemailtemplate.php
U modules/Users/ListView.php
U modules/Users/Security.php
U modules/Users/updateLeadDBStatus.php
U modules/Users/UserInfoUtil.php
U modules/Users/SaveRole.php
U modules/Products/Popup.php
U modules/Products/AddProductsToPriceBook.php
U modules/Products/VendorPopup.php
U modules/Products/ListView.php
U modules/Products/Delete.php
U modules/Products/PriceBookListView.php
U modules/Products/Product.php
U modules/Products/VendorListView.php
U modules/Activities/Activity.php
U modules/Activities/ListView.php
U modules/Activities/RenderRelatedListUI.php
U modules/Activities/OpenListView.php
U modules/CustomView/Save.php
U modules/CustomView/CustomView.php
U modules/Faq/ListView.php
U modules/uploads/add2db.php
U modules/Calendar/appointment.pinc
U modules/Import/UsersLastImport.php
U modules/Emails/Email.php
U modules/Emails/ListView.php
U modules/Meetings/ListView.php
U modules/Contacts/Contact.php
U modules/Contacts/Popup.php
U modules/Contacts/SaveBusinessCard.php
U modules/Contacts/ListView.php
U data/CRMEntity.php
U data/SugarBean.php
U include/RelatedListView.php
U include/database/PearDatabase.php
U include/PopulateComboValues.php
U include/utils.php
U soap.php
U contactserialize.php
U schema/DatabaseSchema.xml
U install/5createTables.inc.php
U install/4createConfigFile.php
U install/1checkSystem.php
U install/2setConfig.php
U install/populateSeedData.php
U install/3confirmConfig.php
U adodb/adodb.inc.php
U adodb/adodb-lib.inc.php
U adodb/drivers/adodb-mysql.inc.php
Updated to revision 5305.
Confirm my working copy info:
$ svn info
Path: .
URL: http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2
Repository Root: http://jeffk@vtiger.fosslabs.com/svn/vtiger
Repository UUID: 83ef7b00-670c-0410-b3e3-e45103aa6900
Revision: 5305
Node Kind: directory
Schedule: normal
Last Changed Author: allanbush
Last Changed Rev: 5113
Last Changed Date: 2006-04-13 17:25:30 -0400 (Thu, 13 Apr 2006)
Perform the actual merge. The form is 'svn merge URL1 URL2'. This updates
your working copy with the diff between URL1 and URL2. You
confirm the correctness of the merge, write an appropriate message
referencing trac tickets, and commit.
Since we've been keeping the diff minimized with regular update merges,
this merge should a) apply cleanly, and b) represent only the
required changes to add postgresql support to vtigercrm-4.2.4. This
changeset will be a very useful reference for the equivalent
effort on the vtigercrm/trunk
$ svn merge
http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2
http://jeffk@vtiger.fosslabs.com/svn/vtiger/vtigercrm/branches/4.2_postgresql_integration
U config.inc.php
U sendreminder.php
U modules/Accounts/ListViewTop.php
U modules/Accounts/Account.php
U modules/Accounts/Popup_picker.php
U modules/Accounts/Popup.php
U modules/Accounts/ListView.php
U modules/Accounts/AccountFormBase.php
U modules/Quotes/Quote.php
U modules/Quotes/Delete.php
U modules/Quotes/Popup.php
U modules/Quotes/ListView.php
U modules/Potentials/Popup.php
U modules/Potentials/ListView.php
U modules/Potentials/Opportunity.php
U modules/Leads/Popup.php
U modules/Leads/Lead.php
U modules/Leads/ListView.php
U modules/Leads/LeadConvertToEntities.php
U modules/Home/UnifiedSearch.php
U modules/Notes/Delete.php
U modules/Notes/ListView.php
U modules/Invoice/Invoice.php
U modules/Invoice/ListView.php
U modules/Orders/SalesOrderListView.php
U modules/Orders/SalesOrder.php
U modules/Orders/Order.php
U modules/Orders/DeleteSalesOrder.php
U modules/Orders/PopupSalesOrder.php
U modules/Orders/ListView.php
U modules/Reports/ReportRun.php
U modules/Reports/SaveReportFolder.php
U modules/Reports/Save.php
U modules/Reports/Reports.php
U modules/Reports/PopulateReports.php
U modules/HelpDesk/HelpDesk.php
U modules/HelpDesk/FaqList.php
U modules/HelpDesk/ListView.php
U modules/Settings/SaveConvertLead.php
U modules/Settings/DeleteCustomField.php
U modules/Settings/UpdateComboValues.php
U modules/Users/User.php
U modules/Users/SaveProfile.php
U modules/Users/SaveOrgSharing.php
U modules/Users/massdelete.php
U modules/Users/LoginHistory.php
U modules/Users/saveemailtemplate.php
U modules/Users/ListView.php
U modules/Users/Security.php
U modules/Users/updateLeadDBStatus.php
U modules/Users/UserInfoUtil.php
U modules/Users/SaveRole.php
U modules/Products/Popup.php
U modules/Products/AddProductsToPriceBook.php
U modules/Products/VendorPopup.php
U modules/Products/ListView.php
U modules/Products/Delete.php
U modules/Products/PriceBookListView.php
U modules/Products/Product.php
U modules/Products/VendorListView.php
U modules/Activities/Activity.php
U modules/Activities/ListView.php
U modules/Activities/RenderRelatedListUI.php
U modules/Activities/OpenListView.php
U modules/CustomView/Save.php
U modules/CustomView/CustomView.php
U modules/Faq/ListView.php
U modules/uploads/add2db.php
U modules/Calendar/appointment.pinc
U modules/Import/UsersLastImport.php
U modules/Emails/Email.php
U modules/Emails/ListView.php
U modules/Meetings/ListView.php
U modules/Contacts/Contact.php
U modules/Contacts/Popup.php
U modules/Contacts/SaveBusinessCard.php
U modules/Contacts/ListView.php
U data/CRMEntity.php
U data/SugarBean.php
U include/RelatedListView.php
U include/database/PearDatabase.php
U include/PopulateComboValues.php
U include/utils.php
U soap.php
U contactserialize.php
U schema/DatabaseSchema.xml
U install/5createTables.inc.php
U install/4createConfigFile.php
U install/1checkSystem.php
U install/2setConfig.php
U install/populateSeedData.php
U install/3confirmConfig.php
U adodb/adodb.inc.php
U adodb/adodb-lib.inc.php
U adodb/drivers/adodb-mysql.inc.php
All files modified by the merge have indicator 'U', meaning clean update.
If there had been any 'C' conflicts, you'd need to repair
them manually.
Please note that this is only a blind merge of the two branches. In
addition to testing, there *will* need to be work done on the 4.2
branch to support both mysql and postgresql for the end user. This
integration should be done as quickly as possible, and a
vtigercrm/tags/vtigercrm-4.2.5 release created.
--
Ticket URL: <http://vtiger.fosslabs.com/ticket/62>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM
More information about the vtigercrm-commits
mailing list