Commit 5ba79c6e authored by Vincent Pelletier's avatar Vincent Pelletier

Add ZSQLMethods on both catalogs.

Otherwise, "dummy" table would not be created by original catalog's clear.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36248 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a071a4fa
...@@ -1706,29 +1706,34 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -1706,29 +1706,34 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
PRIMARY KEY (`uid`) PRIMARY KEY (`uid`)
) TYPE=InnoDB; ) TYPE=InnoDB;
""" """
new_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
id='z_create_dummy_table', title='', arguments="",
connection_id=self.new_erp5_sql_connection,
template=create_dummy_table_sql)
drop_summy_table_sql = """ drop_summy_table_sql = """
DROP TABLE IF EXISTS `dummy` DROP TABLE IF EXISTS `dummy`
""" """
new_catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod( for catalog, connection_id in ((original_catalog, original_connection_id),
(new_catalog, self.new_erp5_sql_connection)):
catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
id='z_create_dummy_table', title='', arguments="",
connection_id=connection_id,
template=create_dummy_table_sql)
catalog.manage_addProduct['ZSQLMethods'].manage_addZSQLMethod(
id='z0_drop_dummy_table', title='', arguments="", id='z0_drop_dummy_table', title='', arguments="",
connection_id=self.new_erp5_sql_connection, connection_id=connection_id,
template=drop_summy_table_sql) template=drop_summy_table_sql)
# update catalog configuration and declare new ZSQLMethods # update catalog configuration and declare new ZSQLMethods
sql_clear_catalog_list = list(new_catalog.sql_clear_catalog) sql_clear_catalog_list = list(original_catalog.sql_clear_catalog)
sql_clear_catalog_list.extend(['z0_drop_dummy_table', sql_clear_catalog_list.extend(['z0_drop_dummy_table',
'z_create_dummy_table']) 'z_create_dummy_table'])
sql_clear_catalog_list.sort() sql_clear_catalog_list.sort()
new_catalog.sql_clear_catalog = tuple(sql_clear_catalog_list) original_catalog.sql_clear_catalog = new_catalog.sql_clear_catalog = \
tuple(sql_clear_catalog_list)
sql_search_table_list = list(new_catalog.sql_search_tables) sql_search_table_list = list(original_catalog.sql_search_tables)
sql_search_table_list.append('dummy') sql_search_table_list.append('dummy')
sql_search_table_list.sort() sql_search_table_list.sort()
new_catalog.sql_search_tables = tuple(sql_search_table_list) original_catalog.sql_search_tables = new_catalog.sql_search_tables = \
tuple(sql_search_table_list)
portal_catalog.manage_catalogClear() portal_catalog.manage_catalogClear()
transaction.commit() transaction.commit()
# Catalog structure changed, so we should be able to build new queries # Catalog structure changed, so we should be able to build new queries
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment