--- a/server/sources/native.py Fri Aug 21 14:50:20 2009 +0200
+++ b/server/sources/native.py Fri Aug 21 14:52:07 2009 +0200
@@ -94,8 +94,6 @@
"""adapter for source using the native cubicweb schema (see below)
"""
sqlgen_class = SQLGenerator
- # need default value on class since migration doesn't call init method
- has_deleted_entitites_table = True
passwd_rql = "Any P WHERE X is CWUser, X login %(login)s, X upassword P"
auth_rql = "Any X WHERE X is CWUser, X login %(login)s, X upassword %(pwd)s"
@@ -224,15 +222,6 @@
def init(self):
self.init_creating()
- pool = self.repo._get_pool()
- pool.pool_set()
- # XXX cubicweb < 2.42 compat
- if 'deleted_entities' in self.dbhelper.list_tables(pool['system']):
- self.has_deleted_entitites_table = True
- else:
- self.has_deleted_entitites_table = False
- pool.pool_reset()
- self.repo._free_pool(pool)
def map_attribute(self, etype, attr, cb):
self._rql_sqlgen.attr_map['%s.%s' % (etype, attr)] = cb
@@ -547,13 +536,12 @@
"""
attrs = {'eid': eid}
session.system_sql(self.sqlgen.delete('entities', attrs), attrs)
- if self.has_deleted_entitites_table:
- if extid is not None:
- assert isinstance(extid, str), type(extid)
- extid = b64encode(extid)
- attrs = {'type': etype, 'eid': eid, 'extid': extid,
- 'source': uri, 'dtime': datetime.now()}
- session.system_sql(self.sqlgen.insert('deleted_entities', attrs), attrs)
+ if extid is not None:
+ assert isinstance(extid, str), type(extid)
+ extid = b64encode(extid)
+ attrs = {'type': etype, 'eid': eid, 'extid': extid,
+ 'source': uri, 'dtime': datetime.now()}
+ session.system_sql(self.sqlgen.insert('deleted_entities', attrs), attrs)
def fti_unindex_entity(self, session, eid):
"""remove text content for entity with the given eid from the full text