[Erp5-report] r28920 - /erp5/trunk/products/ERP5/ERP5Site.py

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Sep 11 10:13:18 2009
New Revision: 28920

URL: http://svn.erp5.org?rev=28920&view=rev
Log:
erp5_sql_deferred_connection_string must match erp5_sql_connection_string, but erp5_sql_deferred_connection_type must be a deferred connection

Modified:
    erp5/trunk/products/ERP5/ERP5Site.py

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=28920&r1=28919&r2=28920&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Fri Sep 11 10:13:18 2009
@@ -65,6 +65,8 @@
                        erp5_catalog_storage='',
                        erp5_sql_connection_type='Z MySQL Database Connection',
                        erp5_sql_connection_string='test test',
+                       erp5_sql_deferred_connection_type=\
+                           'Z MySQL Deferred Database Connection',
                        cmf_activity_sql_connection_type= \
                            'Z MySQL Database Connection',
                        cmf_activity_sql_connection_string='test test',
@@ -82,6 +84,7 @@
                  erp5_catalog_storage,
                  erp5_sql_connection_type,
                  erp5_sql_connection_string,
+                 erp5_sql_deferred_connection_type,
                  cmf_activity_sql_connection_type,
                  cmf_activity_sql_connection_string,
                  create_activities=create_activities,
@@ -1218,6 +1221,7 @@
              erp5_catalog_storage,
              erp5_sql_connection_type,
              erp5_sql_connection_string,
+             erp5_sql_deferred_connection_type,
              cmf_activity_sql_connection_type,
              cmf_activity_sql_connection_string,
              create_activities=1,
@@ -1232,7 +1236,6 @@
     # Return the fully wrapped object.
     p = parent.this()._getOb(id)
 
-    erp5_sql_deferred_connection_type = erp5_sql_connection_type
     erp5_sql_deferred_connection_string = erp5_sql_connection_string
     p._setProperty('erp5_catalog_storage',
                    erp5_catalog_storage, 'string')