equal
deleted
inserted
replaced
86 as CWRType and CWEType entities |
86 as CWRType and CWEType entities |
87 """ |
87 """ |
88 repo = session.repo |
88 repo = session.repo |
89 dbhelper = repo.system_source.dbhelper |
89 dbhelper = repo.system_source.dbhelper |
90 # XXX bw compat (3.6 migration) |
90 # XXX bw compat (3.6 migration) |
91 sqlcu = session.pool['system'] |
91 sqlcu = session.cnxset['system'] |
92 sqlcu.execute("SELECT * FROM cw_CWRType WHERE cw_name='symetric'") |
92 sqlcu.execute("SELECT * FROM cw_CWRType WHERE cw_name='symetric'") |
93 if sqlcu.fetchall(): |
93 if sqlcu.fetchall(): |
94 sql = dbhelper.sql_rename_col('cw_CWRType', 'cw_symetric', 'cw_symmetric', |
94 sql = dbhelper.sql_rename_col('cw_CWRType', 'cw_symetric', 'cw_symmetric', |
95 dbhelper.TYPE_MAPPING['Boolean'], True) |
95 dbhelper.TYPE_MAPPING['Boolean'], True) |
96 sqlcu.execute(sql) |
96 sqlcu.execute(sql) |
136 sqlexec('UPDATE deleted_entities SET type=%(n)s WHERE type=%(x)s', |
136 sqlexec('UPDATE deleted_entities SET type=%(n)s WHERE type=%(x)s', |
137 {'x': etype, 'n': netype}) |
137 {'x': etype, 'n': netype}) |
138 except: |
138 except: |
139 pass |
139 pass |
140 tocleanup = [eid] |
140 tocleanup = [eid] |
141 tocleanup += (eid for eid, (eidetype, uri, extid) in repo._type_source_cache.items() |
141 tocleanup += (eid for eid, cached in repo._type_source_cache.iteritems() |
142 if etype == eidetype) |
142 if etype == cached[0]) |
143 repo.clear_caches(tocleanup) |
143 repo.clear_caches(tocleanup) |
144 session.commit(False) |
144 session.commit(False) |
145 if needcopy: |
145 if needcopy: |
146 ertidx[eid] = netype |
146 ertidx[eid] = netype |
147 copiedeids.add(eid) |
147 copiedeids.add(eid) |