--- a/server/test/unittest_rql2sql.py	Tue Mar 09 10:48:46 2010 +0100
+++ b/server/test/unittest_rql2sql.py	Tue Mar 09 10:49:57 2010 +0100
@@ -1068,7 +1068,7 @@
 WHERE rel_is0.eid_to=2'''),
 
     ]
-from logilab.common.adbh import ADV_FUNC_HELPER_DIRECTORY
+from logilab.common.adbh import get_adv_func_helper
 
 class CWRQLTC(RQLGeneratorTC):
     schema = schema
@@ -1103,7 +1103,7 @@
     def setUp(self):
         RQLGeneratorTC.setUp(self)
         indexer = get_indexer('postgres', 'utf8')
-        dbms_helper = ADV_FUNC_HELPER_DIRECTORY['postgres']
+        dbms_helper = get_adv_func_helper('postgres')
         dbms_helper.fti_uid_attr = indexer.uid_attr
         dbms_helper.fti_table = indexer.table
         dbms_helper.fti_restriction_sql = indexer.restriction_sql
@@ -1406,7 +1406,7 @@
     def setUp(self):
         RQLGeneratorTC.setUp(self)
         indexer = get_indexer('sqlite', 'utf8')
-        dbms_helper = ADV_FUNC_HELPER_DIRECTORY['sqlite']
+        dbms_helper = get_adv_func_helper('sqlite')
         dbms_helper.fti_uid_attr = indexer.uid_attr
         dbms_helper.fti_table = indexer.table
         dbms_helper.fti_restriction_sql = indexer.restriction_sql
@@ -1514,7 +1514,7 @@
     def setUp(self):
         RQLGeneratorTC.setUp(self)
         indexer = get_indexer('mysql', 'utf8')
-        dbms_helper = ADV_FUNC_HELPER_DIRECTORY['mysql']
+        dbms_helper = get_adv_func_helper('mysql')
         dbms_helper.fti_uid_attr = indexer.uid_attr
         dbms_helper.fti_table = indexer.table
         dbms_helper.fti_restriction_sql = indexer.restriction_sql