author | Sylvain Thénault <sylvain.thenault@logilab.fr> |
Tue, 07 Sep 2010 23:02:08 +0200 | |
branch | stable |
changeset 6187 | 348c7d93cda3 |
parent 6186 | 8ada7df95877 |
child 6189 | 9fa02f352c8c |
permissions | -rw-r--r-- |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
1 |
# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
2 |
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
3 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
4 |
# This file is part of CubicWeb. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
5 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
6 |
# CubicWeb is free software: you can redistribute it and/or modify it under the |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
7 |
# terms of the GNU Lesser General Public License as published by the Free |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
8 |
# Software Foundation, either version 2.1 of the License, or (at your option) |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
9 |
# any later version. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
10 |
# |
5424
8ecbcbff9777
replace logilab-common by CubicWeb in disclaimer
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5421
diff
changeset
|
11 |
# CubicWeb is distributed in the hope that it will be useful, but WITHOUT |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
13 |
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
14 |
# details. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
15 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
16 |
# You should have received a copy of the GNU Lesser General Public License along |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5399
diff
changeset
|
17 |
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>. |
0 | 18 |
"""a class implementing basic actions used in migration scripts. |
19 |
||
20 |
The following schema actions are supported for now: |
|
21 |
* add/drop/rename attribute |
|
22 |
* add/drop entity/relation type |
|
23 |
* rename entity type |
|
24 |
||
25 |
The following data actions are supported for now: |
|
26 |
* add an entity |
|
27 |
* execute raw RQL queries |
|
5850
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
28 |
""" |
0 | 29 |
|
4925
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
30 |
from __future__ import with_statement |
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
31 |
|
0 | 32 |
__docformat__ = "restructuredtext en" |
33 |
||
34 |
import sys |
|
35 |
import os |
|
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
36 |
import tarfile |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
37 |
import tempfile |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
38 |
import shutil |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
39 |
import os.path as osp |
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
972
diff
changeset
|
40 |
from datetime import datetime |
3903
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
41 |
from glob import glob |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
42 |
from copy import copy |
3903
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
43 |
from warnings import warn |
0 | 44 |
|
2613
5e19c2bb370e
R [all] logilab.common 0.44 provides only deprecated
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2493
diff
changeset
|
45 |
from logilab.common.deprecation import deprecated |
2107
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
46 |
from logilab.common.decorators import cached, clear_cache |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
47 |
from logilab.common.testlib import mock_object |
0 | 48 |
|
49 |
from yams.constraints import SizeConstraint |
|
50 |
from yams.schema2sql import eschema2sql, rschema2sql |
|
51 |
||
6035
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
52 |
from cubicweb import AuthenticationError, ExecutionError |
5558
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
53 |
from cubicweb.schema import (ETYPE_NAME_MAP, META_RTYPES, VIRTUAL_RTYPES, |
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
54 |
PURE_VIRTUAL_RTYPES, |
2926
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
55 |
CubicWebRelationSchema, order_eschemas) |
0 | 56 |
from cubicweb.dbapi import get_repository, repo_connect |
4021
280c910c8710
move i18n / migration modules from cw.common to cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4017
diff
changeset
|
57 |
from cubicweb.migration import MigrationHelper, yes |
4925
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
58 |
from cubicweb.server.session import hooks_control |
0 | 59 |
try: |
2107
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
60 |
from cubicweb.server import SOURCE_TYPES, schemaserial as ss |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
61 |
from cubicweb.server.utils import manager_userpasswd, ask_source_config |
1251
af40e615dc89
introduce a 'cw_' prefix on entity table and column names so we don't conflict with sql or DBMS specific keywords
sylvain.thenault@logilab.fr
parents:
1240
diff
changeset
|
62 |
from cubicweb.server.sqlutils import sqlexec, SQL_PREFIX |
0 | 63 |
except ImportError: # LAX |
64 |
pass |
|
65 |
||
1251
af40e615dc89
introduce a 'cw_' prefix on entity table and column names so we don't conflict with sql or DBMS specific keywords
sylvain.thenault@logilab.fr
parents:
1240
diff
changeset
|
66 |
|
0 | 67 |
class ServerMigrationHelper(MigrationHelper): |
68 |
"""specific migration helper for server side migration scripts, |
|
69 |
providind actions related to schema/data migration |
|
70 |
""" |
|
71 |
||
72 |
def __init__(self, config, schema, interactive=True, |
|
73 |
repo=None, cnx=None, verbosity=1, connect=True): |
|
74 |
MigrationHelper.__init__(self, config, interactive, verbosity) |
|
75 |
if not interactive: |
|
76 |
assert cnx |
|
77 |
assert repo |
|
78 |
if cnx is not None: |
|
79 |
assert repo |
|
80 |
self._cnx = cnx |
|
81 |
self.repo = repo |
|
82 |
elif connect: |
|
83 |
self.repo_connect() |
|
5019
72734c210836
[c-c] new server_maintenance hook, called on c-c shell / upgrade
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4951
diff
changeset
|
84 |
# no config on shell to a remote instance |
5034
4781870e97d9
[maintainance] don't crash if we've no in-memory repository
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5019
diff
changeset
|
85 |
if config is not None and (cnx or connect): |
5019
72734c210836
[c-c] new server_maintenance hook, called on c-c shell / upgrade
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4951
diff
changeset
|
86 |
self.session.data['rebuild-infered'] = False |
72734c210836
[c-c] new server_maintenance hook, called on c-c shell / upgrade
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4951
diff
changeset
|
87 |
self.repo.hm.call_hooks('server_maintenance', repo=self.repo) |
5043
fe52dd3936cf
[repo config] cleanup read_instance_schema / bootstrap_schema / creating mess
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5034
diff
changeset
|
88 |
if not schema and not getattr(config, 'quick_start', False): |
0 | 89 |
schema = config.load_schema(expand_cubes=True) |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
90 |
self.fs_schema = schema |
0 | 91 |
self._synchronized = set() |
92 |
||
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
93 |
# overriden from base MigrationHelper ###################################### |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
94 |
|
0 | 95 |
@cached |
96 |
def repo_connect(self): |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
97 |
self.repo = get_repository(method='inmemory', config=self.config) |
0 | 98 |
return self.repo |
1477 | 99 |
|
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
100 |
def cube_upgraded(self, cube, version): |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
101 |
self.cmd_set_property('system.version.%s' % cube.lower(), |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
102 |
unicode(version)) |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
103 |
self.commit() |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
104 |
|
0 | 105 |
def shutdown(self): |
106 |
if self.repo is not None: |
|
107 |
self.repo.shutdown() |
|
1477 | 108 |
|
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
109 |
def migrate(self, vcconf, toupgrade, options): |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
110 |
if not options.fs_only: |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
111 |
if options.backup_db is None: |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
112 |
self.backup_database() |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
113 |
elif options.backup_db: |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
114 |
self.backup_database(askconfirm=False) |
4925
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
115 |
# disable notification during migration |
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
116 |
with hooks_control(self.session, self.session.HOOKS_ALLOW_ALL, 'notification'): |
0d66fbe050c6
[migration] disable notification by default during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4905
diff
changeset
|
117 |
super(ServerMigrationHelper, self).migrate(vcconf, toupgrade, options) |
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
118 |
|
3715
e3ccadb126d7
[shell] make process_script available throuhg c-c shell / migration script context
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3708
diff
changeset
|
119 |
def cmd_process_script(self, migrscript, funcname=None, *args, **kwargs): |
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
120 |
try: |
6042
df9cafb8062c
[migration] commit only sql script migration
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
6035
diff
changeset
|
121 |
return super(ServerMigrationHelper, self).cmd_process_script( |
6035
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
122 |
migrscript, funcname, *args, **kwargs) |
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
123 |
except ExecutionError, err: |
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
124 |
print >> sys.stderr, "-> %s" % err |
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
125 |
except: |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
126 |
self.rollback() |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
127 |
raise |
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
128 |
|
6035
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
129 |
# Adjust docstring |
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
130 |
cmd_process_script.__doc__ = MigrationHelper.cmd_process_script.__doc__ |
f8c7aa251782
[migration] unify process_script command
Julien Jehannet <julien.jehannet@logilab.fr>
parents:
5999
diff
changeset
|
131 |
|
2275
bc0bed0616a3
fix #344387, remember upgraded version step by step
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2124
diff
changeset
|
132 |
# server specific migration methods ######################################## |
1477 | 133 |
|
0 | 134 |
def backup_database(self, backupfile=None, askconfirm=True): |
135 |
config = self.config |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2489
diff
changeset
|
136 |
repo = self.repo_connect() |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
137 |
# paths |
3192 | 138 |
timestamp = datetime.now().strftime('%Y-%m-%d_%H-%M-%S') |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
139 |
instbkdir = osp.join(config.appdatahome, 'backup') |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
140 |
if not osp.exists(instbkdir): |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
141 |
os.makedirs(instbkdir) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
142 |
backupfile = backupfile or osp.join(instbkdir, '%s-%s.tar.gz' |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
143 |
% (config.appid, timestamp)) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
144 |
# check backup has to be done |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
145 |
if osp.exists(backupfile) and not \ |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
146 |
self.confirm('Backup file %s exists, overwrite it?' % backupfile): |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
147 |
print '-> no backup done.' |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
148 |
return |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
149 |
elif askconfirm and not self.confirm('Backup %s database?' % config.appid): |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
150 |
print '-> no backup done.' |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
151 |
return |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
152 |
open(backupfile,'w').close() # kinda lock |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
153 |
os.chmod(backupfile, 0600) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
154 |
# backup |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
155 |
tmpdir = tempfile.mkdtemp(dir=instbkdir) |
2960
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
156 |
try: |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
157 |
for source in repo.sources: |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
158 |
try: |
4904
a5250dafdcac
[backup] fix misplaced paren
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4893
diff
changeset
|
159 |
source.backup(osp.join(tmpdir, source.uri), self.confirm) |
4893
15ae9a33a7f2
[db backup] fix name error in backup_to_file: we've to pass .confirm all along the chain as for restore
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
160 |
except Exception, ex: |
15ae9a33a7f2
[db backup] fix name error in backup_to_file: we've to pass .confirm all along the chain as for restore
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
161 |
print '-> error trying to backup %s [%s]' % (source.uri, ex) |
2960
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
162 |
if not self.confirm('Continue anyway?', default='n'): |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
163 |
raise SystemExit(1) |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
164 |
else: |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
165 |
break |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
166 |
else: |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
167 |
bkup = tarfile.open(backupfile, 'w|gz') |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
168 |
for filename in os.listdir(tmpdir): |
4721
8f63691ccb7f
pylint style fixes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
169 |
bkup.add(osp.join(tmpdir, filename), filename) |
2960
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
170 |
bkup.close() |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
171 |
# call hooks |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
172 |
repo.hm.call_hooks('server_backup', repo=repo, timestamp=timestamp) |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
173 |
# done |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
174 |
print '-> backup file', backupfile |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
175 |
finally: |
1c6eafc68586
[db-dump] don't create tarball on failed dump, properly remove temporary directory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2959
diff
changeset
|
176 |
shutil.rmtree(tmpdir) |
1477 | 177 |
|
2493
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2489
diff
changeset
|
178 |
def restore_database(self, backupfile, drop=True, systemonly=True, |
9806571ea790
major refactoring of database dump/restore:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2489
diff
changeset
|
179 |
askconfirm=True): |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
180 |
# check |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
181 |
if not osp.exists(backupfile): |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
182 |
raise Exception("Backup file %s doesn't exist" % backupfile) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
183 |
if askconfirm and not self.confirm('Restore %s database from %s ?' |
2959
daabb9bc5233
make db-restore command work even with no/corrupted database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2926
diff
changeset
|
184 |
% (self.config.appid, backupfile)): |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
185 |
return |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
186 |
# unpack backup |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
187 |
tmpdir = tempfile.mkdtemp() |
3105
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
188 |
try: |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
189 |
bkup = tarfile.open(backupfile, 'r|gz') |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
190 |
except tarfile.ReadError: |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
191 |
# assume restoring old backup |
4344
066e7884e57d
add source in backup/restore failure message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4339
diff
changeset
|
192 |
shutil.copy(backupfile, osp.join(tmpdir, 'system')) |
3105
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
193 |
else: |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
194 |
for name in bkup.getnames(): |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
195 |
if name[0] in '/.': |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
196 |
raise Exception('Security check failed, path starts with "/" or "."') |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
197 |
bkup.close() # XXX seek error if not close+open !?! |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
198 |
bkup = tarfile.open(backupfile, 'r|gz') |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
199 |
bkup.extractall(path=tmpdir) |
b788903e77d5
be able to restore pre cw 3.4 database dumps #370595
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
2963
diff
changeset
|
200 |
bkup.close() |
2959
daabb9bc5233
make db-restore command work even with no/corrupted database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2926
diff
changeset
|
201 |
self.config.open_connections_pools = False |
daabb9bc5233
make db-restore command work even with no/corrupted database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2926
diff
changeset
|
202 |
repo = self.repo_connect() |
2861
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
203 |
for source in repo.sources: |
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
204 |
if systemonly and source.uri != 'system': |
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
205 |
continue |
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
206 |
try: |
4195
86dcaf6bb92f
closes #601987
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3935
diff
changeset
|
207 |
source.restore(osp.join(tmpdir, source.uri), self.confirm, drop) |
2861
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
208 |
except Exception, exc: |
4344
066e7884e57d
add source in backup/restore failure message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4339
diff
changeset
|
209 |
print '-> error trying to restore %s [%s]' % (source.uri, exc) |
2861
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
210 |
if not self.confirm('Continue anyway?', default='n'): |
9cb3027407aa
B offer to continue even when failed to restore systemonly
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
211 |
raise SystemExit(1) |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
212 |
shutil.rmtree(tmpdir) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
213 |
# call hooks |
2959
daabb9bc5233
make db-restore command work even with no/corrupted database
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2926
diff
changeset
|
214 |
repo.open_connections_pools() |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
215 |
repo.hm.call_hooks('server_restore', repo=repo, timestamp=backupfile) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
216 |
print '-> database restored.' |
1477 | 217 |
|
0 | 218 |
@property |
219 |
def cnx(self): |
|
220 |
"""lazy connection""" |
|
221 |
try: |
|
222 |
return self._cnx |
|
223 |
except AttributeError: |
|
224 |
sourcescfg = self.repo.config.sources() |
|
225 |
try: |
|
226 |
login = sourcescfg['admin']['login'] |
|
227 |
pwd = sourcescfg['admin']['password'] |
|
228 |
except KeyError: |
|
229 |
login, pwd = manager_userpasswd() |
|
230 |
while True: |
|
231 |
try: |
|
3659 | 232 |
self._cnx = repo_connect(self.repo, login, password=pwd) |
0 | 233 |
if not 'managers' in self._cnx.user(self.session).groups: |
234 |
print 'migration need an account in the managers group' |
|
235 |
else: |
|
236 |
break |
|
237 |
except AuthenticationError: |
|
238 |
print 'wrong user/password' |
|
239 |
except (KeyboardInterrupt, EOFError): |
|
240 |
print 'aborting...' |
|
241 |
sys.exit(0) |
|
242 |
try: |
|
243 |
login, pwd = manager_userpasswd() |
|
244 |
except (KeyboardInterrupt, EOFError): |
|
245 |
print 'aborting...' |
|
246 |
sys.exit(0) |
|
2571
5c837feca73a
oops, this is a method
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2570
diff
changeset
|
247 |
self.session.keep_pool_mode('transaction') |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
248 |
self.session.data['rebuild-infered'] = False |
0 | 249 |
return self._cnx |
250 |
||
251 |
@property |
|
252 |
def session(self): |
|
3700
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
253 |
if self.config is not None: |
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
254 |
session = self.repo._get_session(self.cnx.sessionid) |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
255 |
if session.pool is None: |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
256 |
session.set_read_security(False) |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
257 |
session.set_write_security(False) |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
258 |
session.set_pool() |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
259 |
return session |
3700
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
260 |
# no access to session on remote instance |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
261 |
return None |
1477 | 262 |
|
0 | 263 |
def commit(self): |
264 |
if hasattr(self, '_cnx'): |
|
265 |
self._cnx.commit() |
|
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
266 |
if self.session: |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
267 |
self.session.set_pool() |
1477 | 268 |
|
0 | 269 |
def rollback(self): |
270 |
if hasattr(self, '_cnx'): |
|
271 |
self._cnx.rollback() |
|
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
272 |
if self.session: |
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
273 |
self.session.set_pool() |
1477 | 274 |
|
6186
8ada7df95877
[migration] set ask_confirm=False by default on rqlexec
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6179
diff
changeset
|
275 |
def rqlexecall(self, rqliter, ask_confirm=False): |
0 | 276 |
for rql, kwargs in rqliter: |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
277 |
self.rqlexec(rql, kwargs, ask_confirm=ask_confirm) |
0 | 278 |
|
279 |
@cached |
|
280 |
def _create_context(self): |
|
281 |
"""return a dictionary to use as migration script execution context""" |
|
282 |
context = super(ServerMigrationHelper, self)._create_context() |
|
4017
a5b4d4f2a1c7
use commit in migration script instead of checkpoint
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4011
diff
changeset
|
283 |
context.update({'commit': self.checkpoint, |
4330
cb7b68679501
make rollback available in shell (as commit is)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
284 |
'rollback': self.rollback, |
4017
a5b4d4f2a1c7
use commit in migration script instead of checkpoint
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4011
diff
changeset
|
285 |
'checkpoint': deprecated('[3.6] use commit')(self.checkpoint), |
0 | 286 |
'sql': self.sqlexec, |
287 |
'rql': self.rqlexec, |
|
288 |
'rqliter': self.rqliter, |
|
3707
78596919ede3
[c-c] fixes for shell w/ pyro instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3700
diff
changeset
|
289 |
'schema': self.repo.get_schema(), |
78596919ede3
[c-c] fixes for shell w/ pyro instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3700
diff
changeset
|
290 |
'cnx': self.cnx, |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
291 |
'fsschema': self.fs_schema, |
0 | 292 |
'session' : self.session, |
293 |
'repo' : self.repo, |
|
2788
8d3dbe577d3a
R put version info in deprecation warnings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
294 |
'synchronize_schema': deprecated()(self.cmd_sync_schema_props_perms), # 3.4 |
8d3dbe577d3a
R put version info in deprecation warnings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
295 |
'synchronize_eschema': deprecated()(self.cmd_sync_schema_props_perms), # 3.4 |
8d3dbe577d3a
R put version info in deprecation warnings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2759
diff
changeset
|
296 |
'synchronize_rschema': deprecated()(self.cmd_sync_schema_props_perms), # 3.4 |
0 | 297 |
}) |
298 |
return context |
|
299 |
||
300 |
@cached |
|
301 |
def group_mapping(self): |
|
302 |
"""cached group mapping""" |
|
3700
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
303 |
return ss.group_mapping(self._cw) |
1477 | 304 |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
305 |
@cached |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
306 |
def cstrtype_mapping(self): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
307 |
"""cached constraint types mapping""" |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
308 |
return ss.cstrtype_mapping(self._cw) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
309 |
|
0 | 310 |
def exec_event_script(self, event, cubepath=None, funcname=None, |
1477 | 311 |
*args, **kwargs): |
0 | 312 |
if cubepath: |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
313 |
apc = osp.join(cubepath, 'migration', '%s.py' % event) |
0 | 314 |
else: |
2759
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
315 |
apc = osp.join(self.config.migration_scripts_dir(), '%s.py' % event) |
23d7a75693f8
R refactor backup and use tar.gz to store all sources
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2700
diff
changeset
|
316 |
if osp.exists(apc): |
0 | 317 |
if self.config.free_wheel: |
2835
04034421b072
[hooks] major refactoring:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2788
diff
changeset
|
318 |
self.cmd_deactivate_verification_hooks() |
0 | 319 |
self.info('executing %s', apc) |
320 |
confirm = self.confirm |
|
321 |
execscript_confirm = self.execscript_confirm |
|
322 |
self.confirm = yes |
|
323 |
self.execscript_confirm = yes |
|
324 |
try: |
|
3715
e3ccadb126d7
[shell] make process_script available throuhg c-c shell / migration script context
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3708
diff
changeset
|
325 |
return self.cmd_process_script(apc, funcname, *args, **kwargs) |
0 | 326 |
finally: |
327 |
self.confirm = confirm |
|
328 |
self.execscript_confirm = execscript_confirm |
|
329 |
if self.config.free_wheel: |
|
2835
04034421b072
[hooks] major refactoring:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2788
diff
changeset
|
330 |
self.cmd_reactivate_verification_hooks() |
0 | 331 |
|
3903
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
332 |
def install_custom_sql_scripts(self, directory, driver): |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
333 |
for fpath in glob(osp.join(directory, '*.sql.%s' % driver)): |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
334 |
newname = osp.basename(fpath).replace('.sql.%s' % driver, |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
335 |
'.%s.sql' % driver) |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
336 |
warn('[3.5.6] rename %s into %s' % (fpath, newname), |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
337 |
DeprecationWarning) |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
338 |
print '-> installing', fpath |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
339 |
sqlexec(open(fpath).read(), self.session.system_sql, False, |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
340 |
delimiter=';;') |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
341 |
for fpath in glob(osp.join(directory, '*.%s.sql' % driver)): |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
342 |
print '-> installing', fpath |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
343 |
sqlexec(open(fpath).read(), self.session.system_sql, False, |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
344 |
delimiter=';;') |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
345 |
|
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
346 |
# schema synchronization internals ######################################## |
0 | 347 |
|
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
348 |
def _synchronize_permissions(self, erschema, teid): |
0 | 349 |
"""permission synchronization for an entity or relation type""" |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
350 |
assert teid, erschema |
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
351 |
if 'update' in erschema.ACTIONS or erschema.final: |
0 | 352 |
# entity type |
353 |
exprtype = u'ERQLExpression' |
|
354 |
else: |
|
355 |
# relation type |
|
356 |
exprtype = u'RRQLExpression' |
|
357 |
gm = self.group_mapping() |
|
358 |
confirm = self.verbosity >= 2 |
|
359 |
# * remove possibly deprecated permission (eg in the persistent schema |
|
360 |
# but not in the new schema) |
|
361 |
# * synchronize existing expressions |
|
362 |
# * add new groups/expressions |
|
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
363 |
for action in erschema.ACTIONS: |
0 | 364 |
perm = '%s_permission' % action |
365 |
# handle groups |
|
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
366 |
newgroups = list(erschema.get_groups(action)) |
0 | 367 |
for geid, gname in self.rqlexec('Any G, GN WHERE T %s G, G name GN, ' |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
368 |
'T eid %%(x)s' % perm, {'x': teid}, |
0 | 369 |
ask_confirm=False): |
370 |
if not gname in newgroups: |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
371 |
if not confirm or self.confirm('Remove %s permission of %s to %s?' |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
372 |
% (action, erschema, gname)): |
0 | 373 |
self.rqlexec('DELETE T %s G WHERE G eid %%(x)s, T eid %s' |
374 |
% (perm, teid), |
|
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
375 |
{'x': geid}, ask_confirm=False) |
0 | 376 |
else: |
377 |
newgroups.remove(gname) |
|
378 |
for gname in newgroups: |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
379 |
if not confirm or self.confirm('Grant %s permission of %s to %s?' |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
380 |
% (action, erschema, gname)): |
6075
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
381 |
try: |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
382 |
self.rqlexec('SET T %s G WHERE G eid %%(x)s, T eid %s' |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
383 |
% (perm, teid), |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
384 |
{'x': gm[gname]}, ask_confirm=False) |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
385 |
except KeyError: |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
386 |
self.error('can grant %s perm to unexistant group %s', |
6ebecb217efe
[migration] dont crash if a group doesn't exists (it may not exists yet)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6074
diff
changeset
|
387 |
action, gname) |
0 | 388 |
# handle rql expressions |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
389 |
newexprs = dict((expr.expression, expr) for expr in erschema.get_rqlexprs(action)) |
0 | 390 |
for expreid, expression in self.rqlexec('Any E, EX WHERE T %s E, E expression EX, ' |
391 |
'T eid %s' % (perm, teid), |
|
392 |
ask_confirm=False): |
|
393 |
if not expression in newexprs: |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
394 |
if not confirm or self.confirm('Remove %s expression for %s permission of %s?' |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
395 |
% (expression, action, erschema)): |
0 | 396 |
# deleting the relation will delete the expression entity |
397 |
self.rqlexec('DELETE T %s E WHERE E eid %%(x)s, T eid %s' |
|
398 |
% (perm, teid), |
|
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
399 |
{'x': expreid}, ask_confirm=False) |
0 | 400 |
else: |
401 |
newexprs.pop(expression) |
|
402 |
for expression in newexprs.values(): |
|
403 |
expr = expression.expression |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
404 |
if not confirm or self.confirm('Add %s expression for %s permission of %s?' |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
405 |
% (expr, action, erschema)): |
0 | 406 |
self.rqlexec('INSERT RQLExpression X: X exprtype %%(exprtype)s, ' |
407 |
'X expression %%(expr)s, X mainvars %%(vars)s, T %s X ' |
|
408 |
'WHERE T eid %%(x)s' % perm, |
|
409 |
{'expr': expr, 'exprtype': exprtype, |
|
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
410 |
'vars': expression.mainvars, 'x': teid}, |
0 | 411 |
ask_confirm=False) |
1477 | 412 |
|
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
413 |
def _synchronize_rschema(self, rtype, syncrdefs=True, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
414 |
syncperms=True, syncprops=True): |
0 | 415 |
"""synchronize properties of the persistent relation schema against its |
416 |
current definition: |
|
1477 | 417 |
|
0 | 418 |
* description |
4467
0e73d299730a
fix long-waiting symetric typo: should be spelled symmetric. Add auto database migration on schema deserialization
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4367
diff
changeset
|
419 |
* symmetric, meta |
0 | 420 |
* inlined |
421 |
* relation definitions if `syncrdefs` |
|
422 |
* permissions if `syncperms` |
|
1477 | 423 |
|
0 | 424 |
physical schema changes should be handled by repository's schema hooks |
425 |
""" |
|
426 |
rtype = str(rtype) |
|
427 |
if rtype in self._synchronized: |
|
428 |
return |
|
429 |
self._synchronized.add(rtype) |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
430 |
rschema = self.fs_schema.rschema(rtype) |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
431 |
reporschema = self.repo.schema.rschema(rtype) |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
432 |
if syncprops: |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
433 |
assert reporschema.eid, reporschema |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
434 |
self.rqlexecall(ss.updaterschema2rql(rschema, reporschema.eid), |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
435 |
ask_confirm=self.verbosity>=2) |
0 | 436 |
if syncrdefs: |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
437 |
for subj, obj in rschema.rdefs: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
438 |
if (subj, obj) not in reporschema.rdefs: |
0 | 439 |
continue |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
440 |
if rschema in VIRTUAL_RTYPES: |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
441 |
continue |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
442 |
self._synchronize_rdef_schema(subj, rschema, obj, |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
443 |
syncprops=syncprops, |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
444 |
syncperms=syncperms) |
1477 | 445 |
|
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
446 |
def _synchronize_eschema(self, etype, syncrdefs=True, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
447 |
syncperms=True, syncprops=True): |
0 | 448 |
"""synchronize properties of the persistent entity schema against |
449 |
its current definition: |
|
1477 | 450 |
|
0 | 451 |
* description |
452 |
* internationalizable, fulltextindexed, indexed, meta |
|
453 |
* relations from/to this entity |
|
454 |
* permissions if `syncperms` |
|
455 |
""" |
|
456 |
etype = str(etype) |
|
457 |
if etype in self._synchronized: |
|
458 |
return |
|
459 |
self._synchronized.add(etype) |
|
460 |
repoeschema = self.repo.schema.eschema(etype) |
|
461 |
try: |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
462 |
eschema = self.fs_schema.eschema(etype) |
0 | 463 |
except KeyError: |
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
464 |
return # XXX somewhat unexpected, no?... |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
465 |
if syncprops: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
466 |
repospschema = repoeschema.specializes() |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
467 |
espschema = eschema.specializes() |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
468 |
if repospschema and not espschema: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
469 |
self.rqlexec('DELETE X specializes Y WHERE X is CWEType, X name %(x)s', |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
470 |
{'x': str(repoeschema)}, ask_confirm=False) |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
471 |
elif not repospschema and espschema: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
472 |
self.rqlexec('SET X specializes Y WHERE X is CWEType, X name %(x)s, ' |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
473 |
'Y is CWEType, Y name %(y)s', |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
474 |
{'x': str(repoeschema), 'y': str(espschema)}, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
475 |
ask_confirm=False) |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
476 |
self.rqlexecall(ss.updateeschema2rql(eschema, repoeschema.eid), |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
477 |
ask_confirm=self.verbosity >= 2) |
0 | 478 |
if syncperms: |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
479 |
self._synchronize_permissions(eschema, repoeschema.eid) |
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
480 |
if syncrdefs: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
481 |
for rschema, targettypes, role in eschema.relation_definitions(True): |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
482 |
if rschema in VIRTUAL_RTYPES: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
483 |
continue |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
484 |
if role == 'subject': |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
485 |
if not rschema in repoeschema.subject_relations(): |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
486 |
continue |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
487 |
subjtypes, objtypes = [etype], targettypes |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
488 |
else: # role == 'object' |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
489 |
if not rschema in repoeschema.object_relations(): |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
490 |
continue |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
491 |
subjtypes, objtypes = targettypes, [etype] |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
492 |
self._synchronize_rschema(rschema, syncrdefs=False, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
493 |
syncprops=syncprops, syncperms=syncperms) |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
494 |
reporschema = self.repo.schema.rschema(rschema) |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
495 |
for subj in subjtypes: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
496 |
for obj in objtypes: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
497 |
if (subj, obj) not in reporschema.rdefs: |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
498 |
continue |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
499 |
self._synchronize_rdef_schema(subj, rschema, obj, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
500 |
syncprops=syncprops, syncperms=syncperms) |
0 | 501 |
|
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
502 |
def _synchronize_rdef_schema(self, subjtype, rtype, objtype, |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
503 |
syncperms=True, syncprops=True): |
0 | 504 |
"""synchronize properties of the persistent relation definition schema |
505 |
against its current definition: |
|
506 |
* order and other properties |
|
507 |
* constraints |
|
508 |
""" |
|
509 |
subjtype, objtype = str(subjtype), str(objtype) |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
510 |
rschema = self.fs_schema.rschema(rtype) |
0 | 511 |
reporschema = self.repo.schema.rschema(rschema) |
512 |
if (subjtype, rschema, objtype) in self._synchronized: |
|
513 |
return |
|
514 |
self._synchronized.add((subjtype, rschema, objtype)) |
|
4467
0e73d299730a
fix long-waiting symetric typo: should be spelled symmetric. Add auto database migration on schema deserialization
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4367
diff
changeset
|
515 |
if rschema.symmetric: |
0 | 516 |
self._synchronized.add((objtype, rschema, subjtype)) |
4949
f4dce73da26b
[schema sync] don't try to synchronize infered relation defs, fixing a name error on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4947
diff
changeset
|
517 |
rdef = rschema.rdef(subjtype, objtype) |
f4dce73da26b
[schema sync] don't try to synchronize infered relation defs, fixing a name error on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4947
diff
changeset
|
518 |
if rdef.infered: |
f4dce73da26b
[schema sync] don't try to synchronize infered relation defs, fixing a name error on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4947
diff
changeset
|
519 |
return # don't try to synchronize infered relation defs |
4950
bca0873c0d6e
[schema sync] fix another potential name error on synchronizing rdefs
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4949
diff
changeset
|
520 |
repordef = reporschema.rdef(subjtype, objtype) |
0 | 521 |
confirm = self.verbosity >= 2 |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
522 |
if syncprops: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
523 |
# properties |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
524 |
self.rqlexecall(ss.updaterdef2rql(rdef, repordef.eid), |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
525 |
ask_confirm=confirm) |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
526 |
# constraints |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
527 |
newconstraints = list(rdef.constraints) |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
528 |
# 1. remove old constraints and update constraints of the same type |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
529 |
# NOTE: don't use rschema.constraint_by_type because it may be |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
530 |
# out of sync with newconstraints when multiple |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
531 |
# constraints of the same type are used |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
532 |
for cstr in repordef.constraints: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
533 |
for newcstr in newconstraints: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
534 |
if newcstr.type() == cstr.type(): |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
535 |
break |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
536 |
else: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
537 |
newcstr = None |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
538 |
if newcstr is None: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
539 |
self.rqlexec('DELETE X constrained_by C WHERE C eid %(x)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
540 |
{'x': cstr.eid}, ask_confirm=confirm) |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
541 |
else: |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
542 |
newconstraints.remove(newcstr) |
4947
c3ded0287295
don't update constraints when it's not necessary
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4904
diff
changeset
|
543 |
value = unicode(newcstr.serialize()) |
c3ded0287295
don't update constraints when it's not necessary
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4904
diff
changeset
|
544 |
if value != unicode(cstr.serialize()): |
c3ded0287295
don't update constraints when it's not necessary
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4904
diff
changeset
|
545 |
self.rqlexec('SET X value %(v)s WHERE X eid %(x)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
546 |
{'x': cstr.eid, 'v': value}, |
4947
c3ded0287295
don't update constraints when it's not necessary
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4904
diff
changeset
|
547 |
ask_confirm=confirm) |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
548 |
# 2. add new constraints |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
549 |
cstrtype_map = self.cstrtype_mapping() |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
550 |
self.rqlexecall(ss.constraints2rql(cstrtype_map, newconstraints, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
551 |
repordef.eid), |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
552 |
ask_confirm=confirm) |
4188
b3258d2afe04
fix virtual relation detection: erschema is no more a relation type but a relation def in _synchronize_permissions
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4099
diff
changeset
|
553 |
if syncperms and not rschema in VIRTUAL_RTYPES: |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
554 |
self._synchronize_permissions(rdef, repordef.eid) |
1477 | 555 |
|
0 | 556 |
# base actions ############################################################ |
557 |
||
4011
394f853bb653
[migration] write migration instructions for permissions handling on relation definition
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3998
diff
changeset
|
558 |
def checkpoint(self, ask_confirm=True): |
0 | 559 |
"""checkpoint action""" |
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
560 |
if not ask_confirm or self.confirm('Commit now ?', shell=False): |
0 | 561 |
self.commit() |
562 |
||
563 |
def cmd_add_cube(self, cube, update_database=True): |
|
676
270eb87a768a
provide a new add_cubes() migration function for cases where the new cubes are linked together by new relations
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
447
diff
changeset
|
564 |
self.cmd_add_cubes( (cube,), update_database) |
1477 | 565 |
|
676
270eb87a768a
provide a new add_cubes() migration function for cases where the new cubes are linked together by new relations
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
447
diff
changeset
|
566 |
def cmd_add_cubes(self, cubes, update_database=True): |
0 | 567 |
"""update_database is telling if the database schema should be updated |
568 |
or if only the relevant eproperty should be inserted (for the case where |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2275
diff
changeset
|
569 |
a cube has been extracted from an existing instance, so the |
0 | 570 |
cube schema is already in there) |
571 |
""" |
|
676
270eb87a768a
provide a new add_cubes() migration function for cases where the new cubes are linked together by new relations
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
447
diff
changeset
|
572 |
newcubes = super(ServerMigrationHelper, self).cmd_add_cubes(cubes) |
0 | 573 |
if not newcubes: |
574 |
return |
|
2107
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
575 |
for cube in newcubes: |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
576 |
self.cmd_set_property('system.version.'+cube, |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
577 |
self.config.cube_version(cube)) |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
578 |
if cube in SOURCE_TYPES: |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
579 |
# don't use config.sources() in case some sources have been |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
580 |
# disabled for migration |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
581 |
sourcescfg = self.config.read_sources_file() |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
582 |
sourcescfg[cube] = ask_source_config(cube) |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
583 |
self.config.write_sources_file(sourcescfg) |
6c4a4c514ac2
add source to sources configuration when adding a cube defining a source
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1977
diff
changeset
|
584 |
clear_cache(self.config, 'read_sources_file') |
3836
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
585 |
# ensure added cube is in config cubes |
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
586 |
# XXX worth restoring on error? |
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
587 |
if not cube in self.config._cubes: |
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
588 |
self.config._cubes += (cube,) |
0 | 589 |
if not update_database: |
590 |
self.commit() |
|
591 |
return |
|
1036
593df4919845
when reading the schema while adding/removing cubes, read schema in non-strict mode
sylvain.thenault@logilab.fr
parents:
1016
diff
changeset
|
592 |
newcubes_schema = self.config.load_schema(construction_mode='non-strict') |
3836
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
593 |
# XXX we have to replace fs_schema, used in cmd_add_relation_type |
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
594 |
# etc. and fsschema of migration script contexts |
58c09f21f503
fix necessary when adding a cube which isn't listed in fs dependencies of the instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3715
diff
changeset
|
595 |
self.fs_schema = self._create_context()['fsschema'] = newcubes_schema |
0 | 596 |
new = set() |
597 |
# execute pre-create files |
|
3903
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
598 |
driver = self.repo.system_source.dbdriver |
0 | 599 |
for pack in reversed(newcubes): |
3903
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
600 |
cubedir = self.config.cube_dir(pack) |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
601 |
self.install_custom_sql_scripts(osp.join(cubedir, 'schema'), driver) |
7967d3766ecf
fix #544758 by calling custom sql scripts in add_cubes.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3872
diff
changeset
|
602 |
self.exec_event_script('precreate', cubedir) |
0 | 603 |
# add new entity and relation types |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
604 |
for rschema in newcubes_schema.relations(): |
0 | 605 |
if not rschema in self.repo.schema: |
606 |
self.cmd_add_relation_type(rschema.type) |
|
607 |
new.add(rschema.type) |
|
2926
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
608 |
toadd = [eschema for eschema in newcubes_schema.entities() |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
609 |
if not eschema in self.repo.schema] |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
610 |
for eschema in order_eschemas(toadd): |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
611 |
self.cmd_add_entity_type(eschema.type) |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
612 |
new.add(eschema.type) |
0 | 613 |
# check if attributes has been added to existing entities |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
614 |
for rschema in newcubes_schema.relations(): |
0 | 615 |
existingschema = self.repo.schema.rschema(rschema.type) |
4099
59ff385f7348
yams api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4043
diff
changeset
|
616 |
for (fromtype, totype) in rschema.rdefs: |
59ff385f7348
yams api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4043
diff
changeset
|
617 |
if (fromtype, totype) in existingschema.rdefs: |
0 | 618 |
continue |
619 |
# check we should actually add the relation definition |
|
620 |
if not (fromtype in new or totype in new or rschema in new): |
|
621 |
continue |
|
1477 | 622 |
self.cmd_add_relation_definition(str(fromtype), rschema.type, |
0 | 623 |
str(totype)) |
624 |
# execute post-create files |
|
625 |
for pack in reversed(newcubes): |
|
626 |
self.exec_event_script('postcreate', self.config.cube_dir(pack)) |
|
1477 | 627 |
self.commit() |
628 |
||
2124
5a0b02f37b23
set removedeps to False by default, raise an exception instead of a simple assertion for error, more remove_cube tests
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2122
diff
changeset
|
629 |
def cmd_remove_cube(self, cube, removedeps=False): |
2122
4ea13a828513
add removedeps option to remove_cube to control wether a cube's dependencies should be removed as well or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2107
diff
changeset
|
630 |
removedcubes = super(ServerMigrationHelper, self).cmd_remove_cube( |
4ea13a828513
add removedeps option to remove_cube to control wether a cube's dependencies should be removed as well or not
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2107
diff
changeset
|
631 |
cube, removedeps) |
0 | 632 |
if not removedcubes: |
633 |
return |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
634 |
fsschema = self.fs_schema |
1036
593df4919845
when reading the schema while adding/removing cubes, read schema in non-strict mode
sylvain.thenault@logilab.fr
parents:
1016
diff
changeset
|
635 |
removedcubes_schema = self.config.load_schema(construction_mode='non-strict') |
0 | 636 |
reposchema = self.repo.schema |
637 |
# execute pre-remove files |
|
638 |
for pack in reversed(removedcubes): |
|
639 |
self.exec_event_script('preremove', self.config.cube_dir(pack)) |
|
640 |
# remove cubes'entity and relation types |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
641 |
for rschema in fsschema.relations(): |
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
642 |
if not rschema in removedcubes_schema and rschema in reposchema: |
0 | 643 |
self.cmd_drop_relation_type(rschema.type) |
2926
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
644 |
toremove = [eschema for eschema in fsschema.entities() |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
645 |
if not eschema in removedcubes_schema |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
646 |
and eschema in reposchema] |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
647 |
for eschema in reversed(order_eschemas(toremove)): |
4484387ed012
when adding/removing cubes, we should add/remove entity types in correct order if one inherits from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
648 |
self.cmd_drop_entity_type(eschema.type) |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
649 |
for rschema in fsschema.relations(): |
1477 | 650 |
if rschema in removedcubes_schema and rschema in reposchema: |
651 |
# check if attributes/relations has been added to entities from |
|
0 | 652 |
# other cubes |
4099
59ff385f7348
yams api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4043
diff
changeset
|
653 |
for fromtype, totype in rschema.rdefs: |
59ff385f7348
yams api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4043
diff
changeset
|
654 |
if (fromtype, totype) not in removedcubes_schema[rschema.type].rdefs and \ |
59ff385f7348
yams api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4043
diff
changeset
|
655 |
(fromtype, totype) in reposchema[rschema.type].rdefs: |
0 | 656 |
self.cmd_drop_relation_definition( |
657 |
str(fromtype), rschema.type, str(totype)) |
|
658 |
# execute post-remove files |
|
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
659 |
for cube in reversed(removedcubes): |
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
660 |
self.exec_event_script('postremove', self.config.cube_dir(cube)) |
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
661 |
self.rqlexec('DELETE CWProperty X WHERE X pkey %(pk)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
662 |
{'pk': u'system.version.'+cube}, ask_confirm=False) |
0 | 663 |
self.commit() |
1477 | 664 |
|
0 | 665 |
# schema migration actions ################################################ |
1477 | 666 |
|
0 | 667 |
def cmd_add_attribute(self, etype, attrname, attrtype=None, commit=True): |
668 |
"""add a new attribute on the given entity type""" |
|
669 |
if attrtype is None: |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
670 |
rschema = self.fs_schema.rschema(attrname) |
0 | 671 |
attrtype = rschema.objects(etype)[0] |
672 |
self.cmd_add_relation_definition(etype, attrname, attrtype, commit=commit) |
|
1477 | 673 |
|
0 | 674 |
def cmd_drop_attribute(self, etype, attrname, commit=True): |
675 |
"""drop an existing attribute from the given entity type |
|
1477 | 676 |
|
0 | 677 |
`attrname` is a string giving the name of the attribute to drop |
678 |
""" |
|
679 |
rschema = self.repo.schema.rschema(attrname) |
|
680 |
attrtype = rschema.objects(etype)[0] |
|
681 |
self.cmd_drop_relation_definition(etype, attrname, attrtype, commit=commit) |
|
682 |
||
683 |
def cmd_rename_attribute(self, etype, oldname, newname, commit=True): |
|
684 |
"""rename an existing attribute of the given entity type |
|
1477 | 685 |
|
0 | 686 |
`oldname` is a string giving the name of the existing attribute |
687 |
`newname` is a string giving the name of the renamed attribute |
|
688 |
""" |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
689 |
eschema = self.fs_schema.eschema(etype) |
0 | 690 |
attrtype = eschema.destination(newname) |
691 |
# have to commit this first step anyway to get the definition |
|
692 |
# actually in the schema |
|
693 |
self.cmd_add_attribute(etype, newname, attrtype, commit=True) |
|
694 |
# skipp NULL values if the attribute is required |
|
695 |
rql = 'SET X %s VAL WHERE X is %s, X %s VAL' % (newname, etype, oldname) |
|
4633
a85b4361fb22
3.6 api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4580
diff
changeset
|
696 |
card = eschema.rdef(newname).cardinality[0] |
0 | 697 |
if card == '1': |
698 |
rql += ', NOT X %s NULL' % oldname |
|
699 |
self.rqlexec(rql, ask_confirm=self.verbosity>=2) |
|
3548
4cf5a360952e
add some notes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3213
diff
changeset
|
700 |
# XXX if both attributes fulltext indexed, should skip fti rebuild |
4cf5a360952e
add some notes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3213
diff
changeset
|
701 |
# XXX if old attribute was fti indexed but not the new one old value |
4cf5a360952e
add some notes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3213
diff
changeset
|
702 |
# won't be removed from the index (this occurs on other kind of |
4cf5a360952e
add some notes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3213
diff
changeset
|
703 |
# fulltextindexed change...) |
0 | 704 |
self.cmd_drop_attribute(etype, oldname, commit=commit) |
1477 | 705 |
|
0 | 706 |
def cmd_add_entity_type(self, etype, auto=True, commit=True): |
707 |
"""register a new entity type |
|
1477 | 708 |
|
0 | 709 |
in auto mode, automatically register entity's relation where the |
710 |
targeted type is known |
|
711 |
""" |
|
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
712 |
instschema = self.repo.schema |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
713 |
assert not etype in instschema |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
714 |
# # XXX (syt) plz explain: if we're adding an entity type, it should |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
715 |
# # not be there... |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
716 |
# eschema = instschema[etype] |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
717 |
# if eschema.final: |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
718 |
# instschema.del_entity_type(etype) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
719 |
# else: |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
720 |
eschema = self.fs_schema.eschema(etype) |
0 | 721 |
confirm = self.verbosity >= 2 |
4043
39ae94e0c8b8
give group mapping where needed
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4042
diff
changeset
|
722 |
groupmap = self.group_mapping() |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
723 |
cstrtypemap = self.cstrtype_mapping() |
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
724 |
# register the entity into CWEType |
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
725 |
execute = self._cw.execute |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
726 |
ss.execschemarql(execute, eschema, ss.eschema2rql(eschema, groupmap)) |
0 | 727 |
# add specializes relation if needed |
5293
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
728 |
specialized = eschema.specializes() |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
729 |
if specialized: |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
730 |
try: |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
731 |
specialized.eid = instschema[specialized].eid |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
732 |
except KeyError: |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
733 |
raise Exception('trying to add entity type but parent type is ' |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
734 |
'not yet in the database schema') |
72e102a06709
[migration] fix bug when trying to add a new entity type that inherit from another
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5289
diff
changeset
|
735 |
self.rqlexecall(ss.eschemaspecialize2rql(eschema), ask_confirm=confirm) |
0 | 736 |
# register entity's attributes |
737 |
for rschema, attrschema in eschema.attribute_definitions(): |
|
738 |
# ignore those meta relations, they will be automatically added |
|
2617
89c62b855f2e
[R schema hooks] rename META_RELATIONS_TYPES into META_RTYPES, use it and other schema consts to avoid errors
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2616
diff
changeset
|
739 |
if rschema.type in META_RTYPES: |
0 | 740 |
continue |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
741 |
if not rschema.type in instschema: |
0 | 742 |
# need to add the relation type and to commit to get it |
743 |
# actually in the schema |
|
744 |
self.cmd_add_relation_type(rschema.type, False, commit=True) |
|
745 |
# register relation definition |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
746 |
rdef = self._get_rdef(rschema, eschema, eschema.destination(rschema)) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
747 |
ss.execschemarql(execute, rdef, ss.rdef2rql(rdef, cstrtypemap, groupmap),) |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
748 |
# take care to newly introduced base class |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
749 |
# XXX some part of this should probably be under the "if auto" block |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
750 |
for spschema in eschema.specialized_by(recursive=False): |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
751 |
try: |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
752 |
instspschema = instschema[spschema] |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
753 |
except KeyError: |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
754 |
# specialized entity type not in schema, ignore |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
755 |
continue |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
756 |
if instspschema.specializes() != eschema: |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
757 |
self.rqlexec('SET D specializes P WHERE D eid %(d)s, P name %(pn)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
758 |
{'d': instspschema.eid, 'pn': eschema.type}, |
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
759 |
ask_confirm=confirm) |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
760 |
for rschema, tschemas, role in spschema.relation_definitions(True): |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
761 |
for tschema in tschemas: |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
762 |
if not tschema in instschema: |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
763 |
continue |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
764 |
if role == 'subject': |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
765 |
subjschema = spschema |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
766 |
objschema = tschema |
3689
deb13e88e037
follow yams 0.25 api changes to improve performance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3582
diff
changeset
|
767 |
if rschema.final and rschema in instspschema.subjrels: |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
768 |
# attribute already set, has_rdef would check if |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
769 |
# it's of the same type, we don't want this so |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
770 |
# simply skip here |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
771 |
continue |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
772 |
elif role == 'object': |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
773 |
subjschema = tschema |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
774 |
objschema = spschema |
4633
a85b4361fb22
3.6 api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4580
diff
changeset
|
775 |
if (rschema.rdef(subjschema, objschema).infered |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
776 |
or (instschema.has_relation(rschema) and |
4633
a85b4361fb22
3.6 api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4580
diff
changeset
|
777 |
(subjschema, objschema) in instschema[rschema].rdefs)): |
4721
8f63691ccb7f
pylint style fixes
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
778 |
continue |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
779 |
self.cmd_add_relation_definition( |
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
780 |
subjschema.type, rschema.type, objschema.type) |
0 | 781 |
if auto: |
782 |
# we have commit here to get relation types actually in the schema |
|
783 |
self.commit() |
|
784 |
added = [] |
|
785 |
for rschema in eschema.subject_relations(): |
|
786 |
# attribute relation have already been processed and |
|
787 |
# 'owned_by'/'created_by' will be automatically added |
|
2617
89c62b855f2e
[R schema hooks] rename META_RELATIONS_TYPES into META_RTYPES, use it and other schema consts to avoid errors
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2616
diff
changeset
|
788 |
if rschema.final or rschema.type in META_RTYPES: |
0 | 789 |
continue |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
790 |
rtypeadded = rschema.type in instschema |
0 | 791 |
for targetschema in rschema.objects(etype): |
792 |
# ignore relations where the targeted type is not in the |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2275
diff
changeset
|
793 |
# current instance schema |
0 | 794 |
targettype = targetschema.type |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
795 |
if not targettype in instschema and targettype != etype: |
0 | 796 |
continue |
797 |
if not rtypeadded: |
|
798 |
# need to add the relation type and to commit to get it |
|
799 |
# actually in the schema |
|
800 |
added.append(rschema.type) |
|
801 |
self.cmd_add_relation_type(rschema.type, False, commit=True) |
|
802 |
rtypeadded = True |
|
803 |
# register relation definition |
|
4467
0e73d299730a
fix long-waiting symetric typo: should be spelled symmetric. Add auto database migration on schema deserialization
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4367
diff
changeset
|
804 |
# remember this two avoid adding twice non symmetric relation |
0 | 805 |
# such as "Emailthread forked_from Emailthread" |
806 |
added.append((etype, rschema.type, targettype)) |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
807 |
rdef = self._get_rdef(rschema, eschema, targetschema) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
808 |
ss.execschemarql(execute, rdef, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
809 |
ss.rdef2rql(rdef, cstrtypemap, groupmap)) |
0 | 810 |
for rschema in eschema.object_relations(): |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
811 |
if rschema.type in META_RTYPES: |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
812 |
continue |
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
813 |
rtypeadded = rschema.type in instschema or rschema.type in added |
0 | 814 |
for targetschema in rschema.subjects(etype): |
815 |
# ignore relations where the targeted type is not in the |
|
2476
1294a6bdf3bf
application -> instance where it makes sense
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2275
diff
changeset
|
816 |
# current instance schema |
0 | 817 |
targettype = targetschema.type |
818 |
# don't check targettype != etype since in this case the |
|
819 |
# relation has already been added as a subject relation |
|
2963
12ad88615a12
test and fix migration introducing base classes (w/ regard to yams inheritance)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2962
diff
changeset
|
820 |
if not targettype in instschema: |
0 | 821 |
continue |
822 |
if not rtypeadded: |
|
823 |
# need to add the relation type and to commit to get it |
|
824 |
# actually in the schema |
|
825 |
self.cmd_add_relation_type(rschema.type, False, commit=True) |
|
826 |
rtypeadded = True |
|
827 |
elif (targettype, rschema.type, etype) in added: |
|
828 |
continue |
|
829 |
# register relation definition |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
830 |
rdef = self._get_rdef(rschema, targetschema, eschema) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
831 |
ss.execschemarql(execute, rdef, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
832 |
ss.rdef2rql(rdef, cstrtypemap, groupmap)) |
0 | 833 |
if commit: |
834 |
self.commit() |
|
1477 | 835 |
|
0 | 836 |
def cmd_drop_entity_type(self, etype, commit=True): |
837 |
"""unregister an existing entity type |
|
1477 | 838 |
|
0 | 839 |
This will trigger deletion of necessary relation types and definitions |
840 |
""" |
|
841 |
# XXX what if we delete an entity type which is specialized by other types |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
842 |
# unregister the entity from CWEType |
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
843 |
self.rqlexec('DELETE CWEType X WHERE X name %(etype)s', {'etype': etype}, |
0 | 844 |
ask_confirm=self.verbosity>=2) |
845 |
if commit: |
|
846 |
self.commit() |
|
847 |
||
6115
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
848 |
def cmd_rename_entity_type(self, oldname, newname, attrs=None, commit=True): |
0 | 849 |
"""rename an existing entity type in the persistent schema |
1477 | 850 |
|
0 | 851 |
`oldname` is a string giving the name of the existing entity type |
852 |
`newname` is a string giving the name of the renamed entity type |
|
853 |
""" |
|
5558
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
854 |
schema = self.repo.schema |
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
855 |
if newname in schema: |
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
856 |
assert oldname in ETYPE_NAME_MAP, \ |
6115
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
857 |
'%s should be mapped to %s in ETYPE_NAME_MAP' % (oldname, |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
858 |
newname) |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
859 |
if attrs is None: |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
860 |
attrs = ','.join(SQL_PREFIX + rschema.type |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
861 |
for rschema in schema[newname].subject_relations() |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
862 |
if (rschema.final or rschema.inlined) |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
863 |
and not rschema in PURE_VIRTUAL_RTYPES) |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
864 |
else: |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
865 |
attrs += ('eid', 'creation_date', 'modification_date', 'cwuri') |
56ec278b843e
[migration] we can now specify attributes to backport to rename_entity_type using its attrs argument
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6075
diff
changeset
|
866 |
attrs = ','.join(SQL_PREFIX + attr for attr in attrs) |
5558
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
867 |
self.sqlexec('INSERT INTO %s%s(%s) SELECT %s FROM %s%s' % ( |
5999
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
868 |
SQL_PREFIX, newname, attrs, attrs, SQL_PREFIX, oldname), |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
869 |
ask_confirm=False) |
5897
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
870 |
# old entity type has not been added to the schema, can't gather it |
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
871 |
new = schema.eschema(newname) |
6117 | 872 |
oldeid = self.rqlexec('CWEType ET WHERE ET name %(on)s', |
873 |
{'on': oldname}, ask_confirm=False)[0][0] |
|
5897
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
874 |
# backport old type relations to new type |
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
875 |
# XXX workflows, other relations? |
5999
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
876 |
for r1, rr1 in [('from_entity', 'to_entity'), |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
877 |
('to_entity', 'from_entity')]: |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
878 |
self.rqlexec('SET X %(r1)s NET WHERE X %(r1)s OET, ' |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
879 |
'NOT EXISTS(X2 %(r1)s NET, X relation_type XRT, ' |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
880 |
'X2 relation_type XRT, X %(rr1)s XTE, X2 %(rr1)s XTE), ' |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
881 |
'OET eid %%(o)s, NET eid %%(n)s' % locals(), |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
882 |
{'o': oldeid, 'n': new.eid}, ask_confirm=False) |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
883 |
# backport is / is_instance_of relation to new type |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
884 |
for rtype in ('is', 'is_instance_of'): |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
885 |
self.sqlexec('UPDATE %s_relation SET eid_to=%s WHERE eid_to=%s' |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
886 |
% (rtype, new.eid, oldeid), ask_confirm=False) |
eaf8219f8b7d
[migration] fix rename_entity_type to avoid to loose some relations on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5928
diff
changeset
|
887 |
# delete relations using SQL to avoid relations content removal |
6074
f2580c7abc26
[migration] fix rename_entity_type bug: not putting eids of relation deleted using sql query may cause later error on commit, complaining on missing relation on an entity which has been actually deleted
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6073
diff
changeset
|
888 |
# triggered by schema synchronization hooks. Should add deleted eids |
f2580c7abc26
[migration] fix rename_entity_type bug: not putting eids of relation deleted using sql query may cause later error on commit, complaining on missing relation on an entity which has been actually deleted
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6073
diff
changeset
|
889 |
# into pending eids else we may get some validation error on commit |
f2580c7abc26
[migration] fix rename_entity_type bug: not putting eids of relation deleted using sql query may cause later error on commit, complaining on missing relation on an entity which has been actually deleted
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6073
diff
changeset
|
890 |
# since integrity hooks may think some required relation is |
f2580c7abc26
[migration] fix rename_entity_type bug: not putting eids of relation deleted using sql query may cause later error on commit, complaining on missing relation on an entity which has been actually deleted
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6073
diff
changeset
|
891 |
# missing... |
f2580c7abc26
[migration] fix rename_entity_type bug: not putting eids of relation deleted using sql query may cause later error on commit, complaining on missing relation on an entity which has been actually deleted
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6073
diff
changeset
|
892 |
pending = self.session.transaction_data.setdefault('pendingeids', set()) |
6116
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
893 |
for rdeftype in ('CWRelation', 'CWAttribute'): |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
894 |
for eid, in self.sqlexec('SELECT cw_eid FROM cw_%s ' |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
895 |
'WHERE cw_from_entity=%%(eid)s OR ' |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
896 |
' cw_to_entity=%%(eid)s' % rdeftype, |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
897 |
{'eid': oldeid}, ask_confirm=False): |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
898 |
pending.add(eid) |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
899 |
self.sqlexec('DELETE FROM cw_%s ' |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
900 |
'WHERE cw_from_entity=%%(eid)s OR ' |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
901 |
'cw_to_entity=%%(eid)s' % rdeftype, |
2530e9c45296
[migration] fix rename_entity_type: avoid removal of attributes on the new entity type from the schema during migration
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6115
diff
changeset
|
902 |
{'eid': oldeid}, ask_confirm=False) |
5897
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
903 |
# remove the old type: use rql to propagate deletion |
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
904 |
self.rqlexec('DELETE CWEType ET WHERE ET name %(on)s', {'on': oldname}, |
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
905 |
ask_confirm=False) |
5558
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
906 |
else: |
5897
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
907 |
self.rqlexec('SET ET name %(newname)s WHERE ET is CWEType, ET name %(on)s', |
0c6f2f866202
[migration] fix rename_entity_type to an existant entity type: get back relation from the old entity type non existant on the target type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5863
diff
changeset
|
908 |
{'newname' : unicode(newname), 'on' : oldname}, |
5558
afd1face1faf
[schema migration] make some stuff to ease file 1.9 migration : we want to kill the Image entity so that existing image are turned into (existing entity type) File entities
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5556
diff
changeset
|
909 |
ask_confirm=False) |
0 | 910 |
if commit: |
911 |
self.commit() |
|
1477 | 912 |
|
0 | 913 |
def cmd_add_relation_type(self, rtype, addrdef=True, commit=True): |
914 |
"""register a new relation type named `rtype`, as described in the |
|
915 |
schema description file. |
|
916 |
||
917 |
`addrdef` is a boolean value; when True, it will also add all relations |
|
918 |
of the type just added found in the schema definition file. Note that it |
|
919 |
implies an intermediate "commit" which commits the relation type |
|
920 |
creation (but not the relation definitions themselves, for which |
|
921 |
committing depends on the `commit` argument value). |
|
1477 | 922 |
|
0 | 923 |
""" |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
924 |
reposchema = self.repo.schema |
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
925 |
rschema = self.fs_schema.rschema(rtype) |
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
926 |
execute = self._cw.execute |
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
927 |
# register the relation into CWRType and insert necessary relation |
0 | 928 |
# definitions |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
929 |
ss.execschemarql(execute, rschema, ss.rschema2rql(rschema, addrdef=False)) |
0 | 930 |
if addrdef: |
931 |
self.commit() |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
932 |
gmap = self.group_mapping() |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
933 |
cmap = self.cstrtype_mapping() |
6073
bf684f1022bf
[migration] fix crash when adding symmetric relation type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6042
diff
changeset
|
934 |
done = set() |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
935 |
for rdef in rschema.rdefs.itervalues(): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
936 |
if not (reposchema.has_entity(rdef.subject) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
937 |
and reposchema.has_entity(rdef.object)): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
938 |
continue |
6073
bf684f1022bf
[migration] fix crash when adding symmetric relation type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6042
diff
changeset
|
939 |
# symmetric relations appears twice |
bf684f1022bf
[migration] fix crash when adding symmetric relation type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6042
diff
changeset
|
940 |
if (rdef.subject, rdef.object) in done: |
bf684f1022bf
[migration] fix crash when adding symmetric relation type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6042
diff
changeset
|
941 |
continue |
bf684f1022bf
[migration] fix crash when adding symmetric relation type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6042
diff
changeset
|
942 |
done.add( (rdef.subject, rdef.object) ) |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
943 |
self._set_rdef_eid(rdef) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
944 |
ss.execschemarql(execute, rdef, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
945 |
ss.rdef2rql(rdef, cmap, gmap)) |
2700
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
946 |
if rtype in META_RTYPES: |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
947 |
# if the relation is in META_RTYPES, ensure we're adding it for |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
948 |
# all entity types *in the persistent schema*, not only those in |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
949 |
# the fs schema |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
950 |
for etype in self.repo.schema.entities(): |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
951 |
if not etype in self.fs_schema: |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
952 |
# get sample object type and rproperties |
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
953 |
objtypes = rschema.objects() |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
954 |
assert len(objtypes) == 1, objtypes |
2700
ecf888c8a250
[migration] when adding a core meta-relation, it should be added to all entities *in the persistent schema*, not only those in the fs schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2680
diff
changeset
|
955 |
objtype = objtypes[0] |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
956 |
rdef = copy(rschema.rdef(rschema.subjects(objtype)[0], objtype)) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
957 |
rdef.subject = etype |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
958 |
rdef.rtype = self.repo.schema.rschema(rschema) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
959 |
rdef.object = self.repo.schema.rschema(objtype) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
960 |
ss.execschemarql(execute, rdef, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
961 |
ss.rdef2rql(rdef, cmap, gmap)) |
0 | 962 |
if commit: |
963 |
self.commit() |
|
1477 | 964 |
|
0 | 965 |
def cmd_drop_relation_type(self, rtype, commit=True): |
966 |
"""unregister an existing relation type""" |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
967 |
# unregister the relation from CWRType |
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
968 |
self.rqlexec('DELETE CWRType X WHERE X name %r' % rtype, |
0 | 969 |
ask_confirm=self.verbosity>=2) |
970 |
if commit: |
|
971 |
self.commit() |
|
1477 | 972 |
|
0 | 973 |
def cmd_rename_relation(self, oldname, newname, commit=True): |
974 |
"""rename an existing relation |
|
1477 | 975 |
|
0 | 976 |
`oldname` is a string giving the name of the existing relation |
977 |
`newname` is a string giving the name of the renamed relation |
|
978 |
""" |
|
979 |
self.cmd_add_relation_type(newname, commit=True) |
|
980 |
self.rqlexec('SET X %s Y WHERE X %s Y' % (newname, oldname), |
|
981 |
ask_confirm=self.verbosity>=2) |
|
982 |
self.cmd_drop_relation_type(oldname, commit=commit) |
|
983 |
||
984 |
def cmd_add_relation_definition(self, subjtype, rtype, objtype, commit=True): |
|
985 |
"""register a new relation definition, from its definition found in the |
|
986 |
schema definition file |
|
987 |
""" |
|
934
f94e34795586
better variable/attribute names; fix remove_cube, it should not alter the .fs_schema attribute (former .new_schema)
sylvain.thenault@logilab.fr
parents:
676
diff
changeset
|
988 |
rschema = self.fs_schema.rschema(rtype) |
0 | 989 |
if not rtype in self.repo.schema: |
990 |
self.cmd_add_relation_type(rtype, addrdef=False, commit=True) |
|
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
991 |
execute = self._cw.execute |
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
992 |
rdef = self._get_rdef(rschema, subjtype, objtype) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
993 |
ss.execschemarql(execute, rdef, |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
994 |
ss.rdef2rql(rdef, self.cstrtype_mapping(), |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
995 |
self.group_mapping())) |
0 | 996 |
if commit: |
997 |
self.commit() |
|
1477 | 998 |
|
4763
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
999 |
def _get_rdef(self, rschema, subjtype, objtype): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1000 |
return self._set_rdef_eid(rschema.rdefs[(subjtype, objtype)]) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1001 |
|
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1002 |
def _set_rdef_eid(self, rdef): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1003 |
for attr in ('rtype', 'subject', 'object'): |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1004 |
schemaobj = getattr(rdef, attr) |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1005 |
if getattr(schemaobj, 'eid', None) is None: |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1006 |
schemaobj.eid = self.repo.schema[schemaobj].eid |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1007 |
assert schemaobj.eid is not None |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1008 |
return rdef |
81b0df087375
schema serialization optimization by using eids instead of type names. Heavy refactoring/cleanup on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4721
diff
changeset
|
1009 |
|
0 | 1010 |
def cmd_drop_relation_definition(self, subjtype, rtype, objtype, commit=True): |
1011 |
"""unregister an existing relation definition""" |
|
1012 |
rschema = self.repo.schema.rschema(rtype) |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1013 |
# unregister the definition from CWAttribute or CWRelation |
3689
deb13e88e037
follow yams 0.25 api changes to improve performance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3582
diff
changeset
|
1014 |
if rschema.final: |
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1015 |
etype = 'CWAttribute' |
0 | 1016 |
else: |
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1017 |
etype = 'CWRelation' |
0 | 1018 |
rql = ('DELETE %s X WHERE X from_entity FE, FE name "%s",' |
1019 |
'X relation_type RT, RT name "%s", X to_entity TE, TE name "%s"') |
|
1020 |
self.rqlexec(rql % (etype, subjtype, rtype, objtype), |
|
1021 |
ask_confirm=self.verbosity>=2) |
|
1022 |
if commit: |
|
1023 |
self.commit() |
|
1477 | 1024 |
|
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1025 |
def cmd_sync_schema_props_perms(self, ertype=None, syncperms=True, |
1409
f4dee84a618f
sql attributes bugfix
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
1399
diff
changeset
|
1026 |
syncprops=True, syncrdefs=True, commit=True): |
0 | 1027 |
"""synchronize the persistent schema against the current definition |
1028 |
schema. |
|
1477 | 1029 |
|
0 | 1030 |
It will synch common stuff between the definition schema and the |
1031 |
actual persistent schema, it won't add/remove any entity or relation. |
|
1032 |
""" |
|
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1033 |
assert syncperms or syncprops, 'nothing to do' |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1034 |
if ertype is not None: |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1035 |
if isinstance(ertype, (tuple, list)): |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1036 |
assert len(ertype) == 3, 'not a relation definition' |
3877
7ca53fc72a0a
reldefsecurity branch :
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3836
diff
changeset
|
1037 |
self._synchronize_rdef_schema(ertype[0], ertype[1], ertype[2], |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
1038 |
syncperms=syncperms, |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
1039 |
syncprops=syncprops) |
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
1040 |
else: |
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1041 |
erschema = self.repo.schema[ertype] |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1042 |
if isinstance(erschema, CubicWebRelationSchema): |
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1043 |
self._synchronize_rschema(erschema, syncrdefs=syncrdefs, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1044 |
syncperms=syncperms, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1045 |
syncprops=syncprops) |
4041
be6e473e6b43
fix sync_schema*: new syncprops argument to sync relation definition as well
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4021
diff
changeset
|
1046 |
else: |
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1047 |
self._synchronize_eschema(erschema, syncrdefs=syncrdefs, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1048 |
syncperms=syncperms, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1049 |
syncprops=syncprops) |
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1050 |
else: |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1051 |
for etype in self.repo.schema.entities(): |
5666
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1052 |
self._synchronize_eschema(etype, syncrdefs=syncrdefs, |
58d6c2c96500
[migration] fix schema synchronization bug
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1053 |
syncprops=syncprops, syncperms=syncperms) |
0 | 1054 |
if commit: |
1055 |
self.commit() |
|
1477 | 1056 |
|
0 | 1057 |
def cmd_change_relation_props(self, subjtype, rtype, objtype, |
1058 |
commit=True, **kwargs): |
|
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1059 |
"""change some properties of a relation definition |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1060 |
|
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1061 |
you usually want to use sync_schema_props_perms instead. |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1062 |
""" |
0 | 1063 |
assert kwargs |
1064 |
restriction = [] |
|
1065 |
if subjtype and subjtype != 'Any': |
|
1066 |
restriction.append('X from_entity FE, FE name "%s"' % subjtype) |
|
1067 |
if objtype and objtype != 'Any': |
|
1068 |
restriction.append('X to_entity TE, TE name "%s"' % objtype) |
|
1069 |
if rtype and rtype != 'Any': |
|
1070 |
restriction.append('X relation_type RT, RT name "%s"' % rtype) |
|
1071 |
assert restriction |
|
1072 |
values = [] |
|
1073 |
for k, v in kwargs.items(): |
|
1074 |
values.append('X %s %%(%s)s' % (k, k)) |
|
1075 |
if isinstance(v, str): |
|
1076 |
kwargs[k] = unicode(v) |
|
1077 |
rql = 'SET %s WHERE %s' % (','.join(values), ','.join(restriction)) |
|
1078 |
self.rqlexec(rql, kwargs, ask_confirm=self.verbosity>=2) |
|
1079 |
if commit: |
|
1080 |
self.commit() |
|
1081 |
||
1082 |
def cmd_set_size_constraint(self, etype, rtype, size, commit=True): |
|
1083 |
"""set change size constraint of a string attribute |
|
1084 |
||
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1085 |
if size is None any size constraint will be removed. |
1477 | 1086 |
|
1087 |
you usually want to use sync_schema_props_perms instead. |
|
0 | 1088 |
""" |
1089 |
oldvalue = None |
|
4695
4aaf87e7f79e
3.6 api update
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4650
diff
changeset
|
1090 |
for constr in self.repo.schema.eschema(etype).rdef(rtype).constraints: |
0 | 1091 |
if isinstance(constr, SizeConstraint): |
1092 |
oldvalue = constr.max |
|
1093 |
if oldvalue == size: |
|
1094 |
return |
|
1095 |
if oldvalue is None and not size is None: |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1096 |
ceid = self.rqlexec('INSERT CWConstraint C: C value %(v)s, C cstrtype CT ' |
0 | 1097 |
'WHERE CT name "SizeConstraint"', |
1098 |
{'v': SizeConstraint(size).serialize()}, |
|
1099 |
ask_confirm=self.verbosity>=2)[0][0] |
|
1100 |
self.rqlexec('SET X constrained_by C WHERE X from_entity S, X relation_type R, ' |
|
1101 |
'S name "%s", R name "%s", C eid %s' % (etype, rtype, ceid), |
|
1102 |
ask_confirm=self.verbosity>=2) |
|
1103 |
elif not oldvalue is None: |
|
1104 |
if not size is None: |
|
1105 |
self.rqlexec('SET C value %%(v)s WHERE X from_entity S, X relation_type R,' |
|
1106 |
'X constrained_by C, C cstrtype CT, CT name "SizeConstraint",' |
|
1107 |
'S name "%s", R name "%s"' % (etype, rtype), |
|
1108 |
{'v': unicode(SizeConstraint(size).serialize())}, |
|
1109 |
ask_confirm=self.verbosity>=2) |
|
1110 |
else: |
|
1111 |
self.rqlexec('DELETE X constrained_by C WHERE X from_entity S, X relation_type R,' |
|
1112 |
'X constrained_by C, C cstrtype CT, CT name "SizeConstraint",' |
|
1113 |
'S name "%s", R name "%s"' % (etype, rtype), |
|
1114 |
ask_confirm=self.verbosity>=2) |
|
1115 |
# cleanup unused constraints |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1116 |
self.rqlexec('DELETE CWConstraint C WHERE NOT X constrained_by C') |
0 | 1117 |
if commit: |
1118 |
self.commit() |
|
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1119 |
|
6179
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1120 |
def cmd_add_unique_together_attrs(self, etype, attrlist, commit=True): |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1121 |
""" |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1122 |
Add a (sql) UNIQUE index on all the underlying columns for the |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1123 |
attributes listed in attrlist. That list can also contain |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1124 |
inlined relations. |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1125 |
""" |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1126 |
prefix = SQL_PREFIX |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1127 |
dbhelper = self.repo.system_source.dbhelper |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1128 |
cols = ['%s%s' % (prefix, col) for col in attrlist] |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1129 |
table = '%s%s' % (prefix, etype) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1130 |
sql = dbhelper.sql_create_multicol_unique_index(table, cols) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1131 |
self.sqlexec(sql, ask_confirm=False) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1132 |
if commit: |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1133 |
self.commit() |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1134 |
|
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1135 |
def cmd_drop_unique_together_attrs(self, etype, attrlist, commit=True): |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1136 |
""" |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1137 |
remove a UNIQUE index created with add_unique_together_attrs |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1138 |
""" |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1139 |
prefix = SQL_PREFIX |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1140 |
dbhelper = self.repo.system_source.dbhelper |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1141 |
cols = ['%s%s' % (prefix, col) for col in attrlist] |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1142 |
table = '%s%s' % (prefix, etype) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1143 |
sql = dbhelper.sql_drop_multicol_unique_index(table, cols) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1144 |
self.sqlexec(sql, ask_confirm=False) |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1145 |
if commit: |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1146 |
self.commit() |
2506ab5d82d7
migration actions for unique_together constraints
Alexandre Fayolle <alexandre.fayolle@logilab.fr>
parents:
6125
diff
changeset
|
1147 |
|
3577
067610a0e12f
add version number to deprecation messages
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3548
diff
changeset
|
1148 |
@deprecated('[3.2] use sync_schema_props_perms(ertype, syncprops=False)') |
1399
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1149 |
def cmd_synchronize_permissions(self, ertype, commit=True): |
3f408c7a164e
unify schema sync migration commands with (hopefuly) a clearer name
sylvain.thenault@logilab.fr
parents:
1398
diff
changeset
|
1150 |
self.cmd_sync_schema_props_perms(ertype, syncprops=False, commit=commit) |
1477 | 1151 |
|
0 | 1152 |
# Workflows handling ###################################################### |
1477 | 1153 |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1154 |
def cmd_add_workflow(self, name, wfof, default=True, commit=False, |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1155 |
**kwargs): |
3582
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1156 |
""" |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1157 |
create a new workflow and links it to entity types |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1158 |
:type name: unicode |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1159 |
:param name: name of the workflow |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1160 |
|
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1161 |
:type wfof: string or list/tuple of strings |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1162 |
:param wfof: entity type(s) having this workflow |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1163 |
|
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1164 |
:type default: bool |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1165 |
:param default: tells wether this is the default workflow |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1166 |
for the specified entity type(s); set it to false in |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1167 |
the case of a subworkflow |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1168 |
|
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1169 |
:rtype: `Workflow` |
28547f21308e
two bits of docstring
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
3577
diff
changeset
|
1170 |
""" |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1171 |
wf = self.cmd_create_entity('Workflow', name=unicode(name), |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1172 |
**kwargs) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1173 |
if not isinstance(wfof, (list, tuple)): |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1174 |
wfof = (wfof,) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1175 |
for etype in wfof: |
2956
6a57c0be0e58
[migration] don't ask confirm here
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2943
diff
changeset
|
1176 |
rset = self.rqlexec( |
6a57c0be0e58
[migration] don't ask confirm here
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2943
diff
changeset
|
1177 |
'SET X workflow_of ET WHERE X eid %(x)s, ET name %(et)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1178 |
{'x': wf.eid, 'et': etype}, ask_confirm=False) |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1179 |
assert rset, 'unexistant entity type %s' % etype |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1180 |
if default: |
2956
6a57c0be0e58
[migration] don't ask confirm here
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2943
diff
changeset
|
1181 |
self.rqlexec( |
6a57c0be0e58
[migration] don't ask confirm here
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2943
diff
changeset
|
1182 |
'SET ET default_workflow X WHERE X eid %(x)s, ET name %(et)s', |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1183 |
{'x': wf.eid, 'et': etype}, ask_confirm=False) |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1184 |
if commit: |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1185 |
self.commit() |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1186 |
return wf |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1187 |
|
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1188 |
# XXX remove once cmd_add_[state|transition] are removed |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1189 |
def _get_or_create_wf(self, etypes): |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1190 |
if not isinstance(etypes, (list, tuple)): |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1191 |
etypes = (etypes,) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1192 |
rset = self.rqlexec('Workflow X WHERE X workflow_of ET, ET name %(et)s', |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1193 |
{'et': etypes[0]}) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1194 |
if rset: |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1195 |
return rset.get_entity(0, 0) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1196 |
return self.cmd_add_workflow('%s workflow' % ';'.join(etypes), etypes) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1197 |
|
4339
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1198 |
@deprecated('[3.5] use add_workflow and Workflow.add_state method', |
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1199 |
stacklevel=3) |
0 | 1200 |
def cmd_add_state(self, name, stateof, initial=False, commit=False, **kwargs): |
1201 |
"""method to ease workflow definition: add a state for one or more |
|
1202 |
entity type(s) |
|
1203 |
""" |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1204 |
wf = self._get_or_create_wf(stateof) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1205 |
state = wf.add_state(name, initial, **kwargs) |
0 | 1206 |
if commit: |
1207 |
self.commit() |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1208 |
return state.eid |
1477 | 1209 |
|
4339
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1210 |
@deprecated('[3.5] use add_workflow and Workflow.add_transition method', |
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1211 |
stacklevel=3) |
0 | 1212 |
def cmd_add_transition(self, name, transitionof, fromstates, tostate, |
1213 |
requiredgroups=(), conditions=(), commit=False, **kwargs): |
|
1214 |
"""method to ease workflow definition: add a transition for one or more |
|
1215 |
entity type(s), from one or more state and to a single state |
|
1216 |
""" |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1217 |
wf = self._get_or_create_wf(transitionof) |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1218 |
tr = wf.add_transition(name, fromstates, tostate, requiredgroups, |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1219 |
conditions, **kwargs) |
0 | 1220 |
if commit: |
1221 |
self.commit() |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1222 |
return tr.eid |
0 | 1223 |
|
4339
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1224 |
@deprecated('[3.5] use Transition.set_transition_permissions method', |
fe93b670343d
some fixes so that deprecation warning are properly localized
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4330
diff
changeset
|
1225 |
stacklevel=3) |
0 | 1226 |
def cmd_set_transition_permissions(self, treid, |
1227 |
requiredgroups=(), conditions=(), |
|
1228 |
reset=True, commit=False): |
|
1229 |
"""set or add (if `reset` is False) groups and conditions for a |
|
1230 |
transition |
|
1231 |
""" |
|
3700
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1232 |
tr = self._cw.entity_from_eid(treid) |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1233 |
tr.set_transition_permissions(requiredgroups, conditions, reset) |
0 | 1234 |
if commit: |
1235 |
self.commit() |
|
1236 |
||
5556
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1237 |
@deprecated('[3.5] use iworkflowable.fire_transition("transition") or ' |
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1238 |
'iworkflowable.change_state("state")', stacklevel=3) |
972 | 1239 |
def cmd_set_state(self, eid, statename, commit=False): |
5556
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5552
diff
changeset
|
1240 |
self._cw.entity_from_eid(eid).cw_adapt_to('IWorkflowable').change_state(statename) |
972 | 1241 |
if commit: |
1242 |
self.commit() |
|
1477 | 1243 |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1244 |
# CWProperty handling ###################################################### |
0 | 1245 |
|
1246 |
def cmd_property_value(self, pkey): |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1247 |
rql = 'Any V WHERE X is CWProperty, X pkey %(k)s, X value V' |
0 | 1248 |
rset = self.rqlexec(rql, {'k': pkey}, ask_confirm=False) |
1249 |
return rset[0][0] |
|
1250 |
||
1251 |
def cmd_set_property(self, pkey, value): |
|
1252 |
value = unicode(value) |
|
1253 |
try: |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1254 |
prop = self.rqlexec('CWProperty X WHERE X pkey %(k)s', {'k': pkey}, |
0 | 1255 |
ask_confirm=False).get_entity(0, 0) |
1256 |
except: |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1257 |
self.cmd_create_entity('CWProperty', pkey=unicode(pkey), value=value) |
0 | 1258 |
else: |
1259 |
self.rqlexec('SET X value %(v)s WHERE X pkey %(k)s', |
|
1260 |
{'k': pkey, 'v': value}, ask_confirm=False) |
|
1261 |
||
1262 |
# other data migration commands ########################################### |
|
1477 | 1263 |
|
3700
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1264 |
@property |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1265 |
def _cw(self): |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1266 |
session = self.session |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1267 |
if session is not None: |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1268 |
session.set_pool() |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1269 |
return session |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1270 |
return self.cnx.request() |
fd550e4dc515
#481017: cubicweb-ctl shell on remote instance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
1271 |
|
5397
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1272 |
def cmd_storage_changed(self, etype, attribute): |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1273 |
"""migrate entities to a custom storage. The new storage is expected to |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1274 |
be set, it will be temporarily removed for the migration. |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1275 |
""" |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1276 |
from logilab.common.shellutils import ProgressBar |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1277 |
source = self.repo.system_source |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1278 |
storage = source.storage(etype, attribute) |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1279 |
source.unset_storage(etype, attribute) |
5552 | 1280 |
rset = self.rqlexec('Any X WHERE X is %s' % etype, ask_confirm=False) |
5397
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1281 |
pb = ProgressBar(len(rset)) |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1282 |
for entity in rset.entities(): |
5551
e41cd3bf5080
[migration] fix storage_change migraction to avoid exhausting the server's memory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
1283 |
# fill cache. Do not fetch that attribute using the global rql query |
e41cd3bf5080
[migration] fix storage_change migraction to avoid exhausting the server's memory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
1284 |
# since we may exhaust memory doing that.... |
e41cd3bf5080
[migration] fix storage_change migraction to avoid exhausting the server's memory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
1285 |
getattr(entity, attribute) |
5397
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1286 |
storage.migrate_entity(entity, attribute) |
5551
e41cd3bf5080
[migration] fix storage_change migraction to avoid exhausting the server's memory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
1287 |
# remove from entity cache to avoid memory exhaustion |
e41cd3bf5080
[migration] fix storage_change migraction to avoid exhausting the server's memory
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
1288 |
del entity[attribute] |
5397
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1289 |
pb.update() |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1290 |
print |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1291 |
source.set_storage(etype, attribute, storage) |
cdbf823450aa
[bfss] new storage_changed migration action to move an attribute to a custom storage. Closes #893941
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5302
diff
changeset
|
1292 |
|
5132
260d73ad4f24
[cleaning] simpler implementation of cmd_create_entity
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
5043
diff
changeset
|
1293 |
def cmd_create_entity(self, etype, commit=False, **kwargs): |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1294 |
"""add a new entity of the given type""" |
3708
95e8c3a9698a
update prototype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3707
diff
changeset
|
1295 |
entity = self._cw.create_entity(etype, **kwargs) |
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1296 |
if commit: |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1297 |
self.commit() |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1298 |
return entity |
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1299 |
|
5928
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1300 |
def cmd_update_etype_fti_weight(self, etype, weight): |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1301 |
if self.repo.system_source.dbdriver == 'postgres': |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1302 |
self.sqlexec('UPDATE appears SET weight=%(weight)s ' |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1303 |
'FROM entities as X ' |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1304 |
'WHERE X.eid=appears.uid AND X.type=%(type)s', |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1305 |
{'type': etype, 'weight': weight}, ask_confirm=False) |
d9936c39d478
[migration] new migration command to change fti weight for an entity t ype
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5897
diff
changeset
|
1306 |
|
5850
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1307 |
def cmd_reindex_entities(self, etypes=None): |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1308 |
"""force reindexaction of entities of the given types or of all |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1309 |
indexable entity types |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1310 |
""" |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1311 |
from cubicweb.server.checkintegrity import reindex_entities |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1312 |
reindex_entities(self.repo.schema, self.session, etypes=etypes) |
fabff2813ee4
[migration] schema should be accessed through .repo
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5666
diff
changeset
|
1313 |
|
4367
fa02f7dccfe4
fix deprecation warnings
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4344
diff
changeset
|
1314 |
@deprecated('[3.5] use create_entity', stacklevel=3) |
0 | 1315 |
def cmd_add_entity(self, etype, *args, **kwargs): |
1316 |
"""add a new entity of the given type""" |
|
2920
64322aa83a1d
start a new workflow engine
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2903
diff
changeset
|
1317 |
return self.cmd_create_entity(etype, *args, **kwargs).eid |
1477 | 1318 |
|
0 | 1319 |
def sqlexec(self, sql, args=None, ask_confirm=True): |
1320 |
"""execute the given sql if confirmed |
|
1477 | 1321 |
|
0 | 1322 |
should only be used for low level stuff undoable with existing higher |
1323 |
level actions |
|
1324 |
""" |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
1325 |
if not ask_confirm or self.confirm('Execute sql: %s ?' % sql): |
0 | 1326 |
try: |
1327 |
cu = self.session.system_sql(sql, args) |
|
1328 |
except: |
|
1329 |
ex = sys.exc_info()[1] |
|
6187
348c7d93cda3
[migration] propose to open pdb on error during execution of rql/sql query
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6186
diff
changeset
|
1330 |
if self.confirm('Error: %s\nabort?' % ex, pdb=True): |
0 | 1331 |
raise |
1332 |
return |
|
1333 |
try: |
|
1334 |
return cu.fetchall() |
|
1335 |
except: |
|
1336 |
# no result to fetch |
|
1337 |
return |
|
1477 | 1338 |
|
4945
356662a6f06c
[migration] new build_descr argument to rqlexec on the migration helper
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4925
diff
changeset
|
1339 |
def rqlexec(self, rql, kwargs=None, cachekey=None, build_descr=True, |
6186
8ada7df95877
[migration] set ask_confirm=False by default on rqlexec
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6179
diff
changeset
|
1340 |
ask_confirm=False): |
0 | 1341 |
"""rql action""" |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1342 |
if cachekey is not None: |
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1343 |
warn('[3.8] cachekey is deprecated, you can safely remove this argument', |
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1344 |
DeprecationWarning, stacklevel=2) |
0 | 1345 |
if not isinstance(rql, (tuple, list)): |
1346 |
rql = ( (rql, kwargs), ) |
|
1347 |
res = None |
|
4835
13b0b96d7982
[repo] enhanced security handling: deprecates unsafe_execute, in favor of explicit read/write security control using the `enabled_security` context manager. Also code executed on the repository side is now unsafe by default.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4834
diff
changeset
|
1348 |
execute = self._cw.execute |
0 | 1349 |
for rql, kwargs in rql: |
1350 |
if kwargs: |
|
1351 |
msg = '%s (%s)' % (rql, kwargs) |
|
1352 |
else: |
|
1353 |
msg = rql |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
1354 |
if not ask_confirm or self.confirm('Execute rql: %s ?' % msg): |
0 | 1355 |
try: |
5174
78438ad513ca
#759035: Automate addition of eid cachekey in RQL analysis
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5132
diff
changeset
|
1356 |
res = execute(rql, kwargs, build_descr=build_descr) |
0 | 1357 |
except Exception, ex: |
6187
348c7d93cda3
[migration] propose to open pdb on error during execution of rql/sql query
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6186
diff
changeset
|
1358 |
if self.confirm('Error: %s\nabort?' % ex, pdb=True): |
0 | 1359 |
raise |
1360 |
return res |
|
1361 |
||
1362 |
def rqliter(self, rql, kwargs=None, ask_confirm=True): |
|
1363 |
return ForRqlIterator(self, rql, None, ask_confirm) |
|
1364 |
||
1365 |
# broken db commands ###################################################### |
|
1366 |
||
1367 |
def cmd_change_attribute_type(self, etype, attr, newtype, commit=True): |
|
1368 |
"""low level method to change the type of an entity attribute. This is |
|
1369 |
a quick hack which has some drawback: |
|
1370 |
* only works when the old type can be changed to the new type by the |
|
1371 |
underlying rdbms (eg using ALTER TABLE) |
|
1372 |
* the actual schema won't be updated until next startup |
|
1373 |
""" |
|
1374 |
rschema = self.repo.schema.rschema(attr) |
|
1375 |
oldtype = rschema.objects(etype)[0] |
|
1376 |
rdefeid = rschema.rproperty(etype, oldtype, 'eid') |
|
1398
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1377 |
sql = ("UPDATE CWAttribute " |
5fe84a5f7035
rename internal entity types to have CW prefix instead of E
sylvain.thenault@logilab.fr
parents:
1263
diff
changeset
|
1378 |
"SET to_entity=(SELECT eid FROM CWEType WHERE name='%s')" |
0 | 1379 |
"WHERE eid=%s") % (newtype, rdefeid) |
1380 |
self.sqlexec(sql, ask_confirm=False) |
|
1381 |
dbhelper = self.repo.system_source.dbhelper |
|
1382 |
sqltype = dbhelper.TYPE_MAPPING[newtype] |
|
1383 |
sql = 'ALTER TABLE %s ALTER COLUMN %s TYPE %s' % (etype, attr, sqltype) |
|
1384 |
self.sqlexec(sql, ask_confirm=False) |
|
1385 |
if commit: |
|
1386 |
self.commit() |
|
1477 | 1387 |
|
0 | 1388 |
def cmd_add_entity_type_table(self, etype, commit=True): |
1389 |
"""low level method to create the sql table for an existing entity. |
|
1390 |
This may be useful on accidental desync between the repository schema |
|
1391 |
and a sql database |
|
1392 |
""" |
|
1393 |
dbhelper = self.repo.system_source.dbhelper |
|
1251
af40e615dc89
introduce a 'cw_' prefix on entity table and column names so we don't conflict with sql or DBMS specific keywords
sylvain.thenault@logilab.fr
parents:
1240
diff
changeset
|
1394 |
tablesql = eschema2sql(dbhelper, self.repo.schema.eschema(etype), |
af40e615dc89
introduce a 'cw_' prefix on entity table and column names so we don't conflict with sql or DBMS specific keywords
sylvain.thenault@logilab.fr
parents:
1240
diff
changeset
|
1395 |
prefix=SQL_PREFIX) |
0 | 1396 |
for sql in tablesql.split(';'): |
1397 |
if sql.strip(): |
|
1398 |
self.sqlexec(sql) |
|
1399 |
if commit: |
|
1400 |
self.commit() |
|
1477 | 1401 |
|
0 | 1402 |
def cmd_add_relation_type_table(self, rtype, commit=True): |
1403 |
"""low level method to create the sql table for an existing relation. |
|
1404 |
This may be useful on accidental desync between the repository schema |
|
1405 |
and a sql database |
|
1406 |
""" |
|
1407 |
dbhelper = self.repo.system_source.dbhelper |
|
1408 |
tablesql = rschema2sql(dbhelper, self.repo.schema.rschema(rtype)) |
|
1409 |
for sql in tablesql.split(';'): |
|
1410 |
if sql.strip(): |
|
1411 |
self.sqlexec(sql) |
|
1412 |
if commit: |
|
1413 |
self.commit() |
|
1477 | 1414 |
|
4843
5f7363416765
fix hooks control method name + other litle cleanups
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4835
diff
changeset
|
1415 |
@deprecated("[3.7] use session.disable_hook_categories('integrity')") |
4834
b718626a0e60
move hooks activation control on session object, so we can have a per transaction control. Added a new `hooks_control` context manager for usual modification of hooks activation.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4763
diff
changeset
|
1416 |
def cmd_deactivate_verification_hooks(self): |
4843
5f7363416765
fix hooks control method name + other litle cleanups
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4835
diff
changeset
|
1417 |
self.session.disable_hook_categories('integrity') |
4834
b718626a0e60
move hooks activation control on session object, so we can have a per transaction control. Added a new `hooks_control` context manager for usual modification of hooks activation.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4763
diff
changeset
|
1418 |
|
4843
5f7363416765
fix hooks control method name + other litle cleanups
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4835
diff
changeset
|
1419 |
@deprecated("[3.7] use session.enable_hook_categories('integrity')") |
4834
b718626a0e60
move hooks activation control on session object, so we can have a per transaction control. Added a new `hooks_control` context manager for usual modification of hooks activation.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4763
diff
changeset
|
1420 |
def cmd_reactivate_verification_hooks(self): |
4843
5f7363416765
fix hooks control method name + other litle cleanups
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4835
diff
changeset
|
1421 |
self.session.enable_hook_categories('integrity') |
4834
b718626a0e60
move hooks activation control on session object, so we can have a per transaction control. Added a new `hooks_control` context manager for usual modification of hooks activation.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4763
diff
changeset
|
1422 |
|
0 | 1423 |
|
1424 |
class ForRqlIterator: |
|
1425 |
"""specific rql iterator to make the loop skipable""" |
|
1426 |
def __init__(self, helper, rql, kwargs, ask_confirm): |
|
1427 |
self._h = helper |
|
1428 |
self.rql = rql |
|
1429 |
self.kwargs = kwargs |
|
1430 |
self.ask_confirm = ask_confirm |
|
1431 |
self._rsetit = None |
|
1477 | 1432 |
|
0 | 1433 |
def __iter__(self): |
1434 |
return self |
|
1477 | 1435 |
|
6125
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1436 |
def _get_rset(self): |
0 | 1437 |
rql, kwargs = self.rql, self.kwargs |
1438 |
if kwargs: |
|
1439 |
msg = '%s (%s)' % (rql, kwargs) |
|
1440 |
else: |
|
1441 |
msg = rql |
|
1442 |
if self.ask_confirm: |
|
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
1443 |
if not self._h.confirm('Execute rql: %s ?' % msg): |
0 | 1444 |
raise StopIteration |
1445 |
try: |
|
6125
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1446 |
return self._h._cw.execute(rql, kwargs) |
0 | 1447 |
except Exception, ex: |
4650
965395d821bc
typo: capitalize migration confirmation messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
4640
diff
changeset
|
1448 |
if self._h.confirm('Error: %s\nabort?' % ex): |
0 | 1449 |
raise |
1450 |
else: |
|
1451 |
raise StopIteration |
|
6125
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1452 |
|
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1453 |
def next(self): |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1454 |
if self._rsetit is not None: |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1455 |
return self._rsetit.next() |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1456 |
rset = self._get_rset() |
0 | 1457 |
self._rsetit = iter(rset) |
1458 |
return self._rsetit.next() |
|
6125
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1459 |
|
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1460 |
def entities(self): |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1461 |
try: |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1462 |
rset = self._get_rset() |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1463 |
except StopIteration: |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1464 |
return [] |
46b9cbbc1e37
[migration] enhance RqlForIterator so we can do 'for e in rqliter(...).entities()'
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6118
diff
changeset
|
1465 |
return rset.entities() |