cubicweb: comparison hooks/syncschema.py

equal deleted inserted replaced

-:6a9e66d788b3
+:26695dd703d8
 session.exception('error while adding column %s to table %s',
 table, column)
 # create index before alter table which may expectingly fail during test
 # (sqlite) while index creation should never fail (test for index existence
 # is done by the dbhelper)
-session.pool.source('system').create_index(session, table, column)
+session.cnxset.source('system').create_index(session, table, column)
 session.info('added index on %s(%s)', table, column)
 def insert_rdef_on_subclasses(session, eschema, rschema, rdefdef, props):
 # XXX 'infered': True/False, not clear actually
 schema = session.vreg.schema
 etype = ybo.EntityType(eid=entity.eid, name=entity.name,
 description=entity.description)
 eschema = schema.add_entity_type(etype)
 # create the necessary table
-tablesql = y2sql.eschema2sql(session.pool.source('system').dbhelper,
+tablesql = y2sql.eschema2sql(session.cnxset.source('system').dbhelper,
 eschema, prefix=SQL_PREFIX)
 for sql in tablesql.split(';'):
 if sql.strip():
 session.system_sql(sql)
 # add meta relations
 def rename(self, oldname, newname):
 self.session.vreg.schema.rename_entity_type(oldname, newname)
 # we need sql to operate physical changes on the system database
 sqlexec = self.session.system_sql
-dbhelper= self.session.pool.source('system').dbhelper
+dbhelper= self.session.cnxset.source('system').dbhelper
 sql = dbhelper.sql_rename_table(SQL_PREFIX+oldname,
 SQL_PREFIX+newname)
 sqlexec(sql)
 self.info('renamed table %s to %s', oldname, newname)
 sqlexec('UPDATE entities SET type=%(newname)s WHERE type=%(oldname)s',
 'fulltextindexed': entity.fulltextindexed,
 'internationalizable': entity.internationalizable}
 # update the in-memory schema first
 rdefdef = self.init_rdef(**props)
 # then make necessary changes to the system source database
-syssource = session.pool.source('system')
+syssource = session.cnxset.source('system')
 attrtype = y2sql.type_from_constraints(
 syssource.dbhelper, rdefdef.object, rdefdef.constraints)
 # XXX should be moved somehow into lgdb: sqlite doesn't support to
 # add a new column with UNIQUE, it should be added after the ALTER TABLE
 # using ADD INDEX
 rdef = self.rdef = self.rschema.rdefs[self.rdefkey]
 # update the in-memory schema first
 self.oldvalues = dict( (attr, getattr(rdef, attr)) for attr in self.values)
 rdef.update(self.values)
 # then make necessary changes to the system source database
-syssource = session.pool.source('system')
+syssource = session.cnxset.source('system')
 if 'indexed' in self.values:
 syssource.update_rdef_indexed(session, rdef)
 self.indexed_changed = True
 if 'cardinality' in self.values and (rdef.rtype.final or
 rdef.rtype.inlined) \
 if self.rdef is None:
 return
 # revert changes on in memory schema
 self.rdef.update(self.oldvalues)
 # revert changes on database
-syssource = self.session.pool.source('system')
+syssource = self.session.cnxset.source('system')
 if self.indexed_changed:
 syssource.update_rdef_indexed(self.session, self.rdef)
 if self.null_allowed_changed:
 syssource.update_rdef_null_allowed(self.session, self.rdef)
 # in-place modification of in-memory schema first
 _set_modifiable_constraints(rdef)
 rdef.constraints.remove(self.oldcstr)
 # then update database: alter the physical schema on size/unique
 # constraint changes
-syssource = session.pool.source('system')
+syssource = session.cnxset.source('system')
 cstrtype = self.oldcstr.type()
 if cstrtype == 'SizeConstraint':
 syssource.update_rdef_column(session, rdef)
 self.size_cstr_changed = True
 elif cstrtype == 'UniqueConstraint':
 if self.newcstr is not None:
 self.rdef.constraints.remove(self.newcstr)
 if self.oldcstr is not None:
 self.rdef.constraints.append(self.oldcstr)
 # revert changes on database
-syssource = self.session.pool.source('system')
+syssource = self.session.cnxset.source('system')
 if self.size_cstr_changed:
 syssource.update_rdef_column(self.session, self.rdef)
 if self.unique_changed:
 syssource.update_rdef_unique(self.session, self.rdef)
 if oldcstr is not None:
 rdef.constraints.remove(oldcstr)
 rdef.constraints.append(newcstr)
 # then update database: alter the physical schema on size/unique
 # constraint changes
-syssource = session.pool.source('system')
+syssource = session.cnxset.source('system')
 if cstrtype == 'SizeConstraint' and (oldcstr is None or
 oldcstr.max != newcstr.max):
 syssource.update_rdef_column(session, rdef)
 self.size_cstr_changed = True
 elif cstrtype == 'UniqueConstraint' and oldcstr is None:
 def precommit_event(self):
 session = self.session
 prefix = SQL_PREFIX
 table = '%s%s' % (prefix, self.entity.constraint_of[0].name)
 cols = ['%s%s' % (prefix, r.name) for r in self.entity.relations]
-dbhelper= session.pool.source('system').dbhelper
+dbhelper= session.cnxset.source('system').dbhelper
 sqls = dbhelper.sqls_create_multicol_unique_index(table, cols)
 for sql in sqls:
 session.system_sql(sql)
 # XXX revertprecommit_event
 cols = [] # for pylint
 def precommit_event(self):
 session = self.session
 prefix = SQL_PREFIX
 table = '%s%s' % (prefix, self.entity.type)
-dbhelper= session.pool.source('system').dbhelper
+dbhelper= session.cnxset.source('system').dbhelper
 cols = ['%s%s' % (prefix, c) for c in self.cols]
 sqls = dbhelper.sqls_drop_multicol_unique_index(table, cols)
 for sql in sqls:
 session.system_sql(sql)
 class MemSchemaPermissionAdd(MemSchemaOperation):
 """synchronize schema when a *_permission relation has been added on a group
 """
 def precommit_event(self):
-"""the observed connections pool has been commited"""
+"""the observed connections.cnxset has been commited"""
 try:
 erschema = self.session.vreg.schema.schema_by_eid(self.eid)
 except KeyError:
 # duh, schema not found, log error and skip operation
 self.warning('no schema for %s', self.eid)
 """synchronize schema when a *_permission relation has been deleted from a
 group
 """
 def precommit_event(self):
-"""the observed connections pool has been commited"""
+"""the observed connections set has been commited"""
 try:
 erschema = self.session.vreg.schema.schema_by_eid(self.eid)
 except KeyError:
 # duh, schema not found, log error and skip operation
 self.warning('no schema for %s', self.eid)
 if still_fti or container is not entity:
 source.fti_unindex_entities(session, [container])
 source.fti_index_entities(session, [container])
 if to_reindex:
 # Transaction has already been committed
-session.pool.commit()
+session.cnxset.commit()
 # specializes synchronization hooks ############################################

changeset 7398	26695dd703d8
parent 7185	6e42b595e5df
child 7460	2455cdbeadca