Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
144
Merge Requests
144
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
b393845b
Commit
b393845b
authored
3 months ago
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "ERP5Site: force READ-COMMITTED isolation for cmf_activity_sql_connection."
This reverts commit
4f133d81
.
parent
981b4795
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
product/ERP5/ERP5Site.py
product/ERP5/ERP5Site.py
+2
-4
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+7
-12
product/ERP5Type/tests/runUnitTest.py
product/ERP5Type/tests/runUnitTest.py
+1
-1
No files found.
product/ERP5/ERP5Site.py
View file @
b393845b
...
...
@@ -50,7 +50,6 @@ from Products.ERP5Type.mixin.response_header_generator import ResponseHeaderGene
from
zLOG
import
LOG
,
INFO
,
WARNING
,
ERROR
from
zExceptions
import
BadRequest
import
os
import
re
import
warnings
import
transaction
from
App.config
import
getConfiguration
...
...
@@ -85,7 +84,7 @@ def manage_addERP5Site(self,
validate_email
=
0
,
erp5_catalog_storage
=
'erp5_mysql_innodb_catalog'
,
erp5_sql_connection_string
=
default_sql_connection_string
,
cmf_activity_sql_connection_string
=
'!READ-COMMITTED %s'
%
default_sql_connection_string
,
cmf_activity_sql_connection_string
=
default_sql_connection_string
,
bt5_repository_url
=
''
,
bt5
=
''
,
id_store_interval
=
''
,
...
...
@@ -2282,8 +2281,7 @@ class ERP5Generator(PortalGenerator):
# The only difference compared to activity connection is the
# minus prepended to the connection string.
if
id
==
'erp5_sql_transactionless_connection'
:
# omit isolation-level and add '-' sign in front of the database.
connection_string
=
re
.
sub
(
r'((?:[%*][^ ]+ )*)(![^ ]+ )?(.+)'
,
r'\1-\3'
,
p
.
cmf_activity_sql_connection_string
)
connection_string
=
'-'
+
p
.
cmf_activity_sql_connection_string
else
:
connection_string
=
getattr
(
p
,
id
+
'_string'
)
manage_add
(
id
,
title
,
connection_string
,
**
kw
)
...
...
This diff is collapsed.
Click to expand it.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
b393845b
...
...
@@ -102,22 +102,17 @@ def _getConnectionStringDict():
connection_string_dict
=
{}
default
=
os
.
environ
.
get
(
'erp5_sql_connection_string'
)
for
connection
in
(
'erp5_sql_connection_string'
,
'erp5_sql_deferred_connection_string'
):
'erp5_sql_deferred_connection_string'
,
# default value for transactionless is derived from value
# for cmf_activity, so process it last
'cmf_activity_sql_connection_string'
):
connection_string
=
os
.
environ
.
get
(
connection
,
default
)
if
connection_string
:
connection_string_dict
[
connection
]
=
connection_string
connection
=
'cmf_activity_sql_connection_string'
# force READ-COMMITTED isolation-level.
connection_string_dict
[
connection
]
=
\
os
.
environ
.
get
(
connection
,
re
.
sub
(
r'((?:[%*][^ ]+ )*)(![^ ]+ )?(.+)'
,
r'\1!READ-COMMITTED \3'
,
connection_string_dict
[
'erp5_sql_connection_string'
]))
# default value for transactionless is derived from value
# for cmf_activity, so process it last
connection
=
'erp5_sql_transactionless_connection_string'
# omit isolation-level and add '-' sign in front of the database.
connection_string_dict
[
connection
]
=
\
os
.
environ
.
get
(
connection
,
re
.
sub
(
r'((?:[%*][^ ]+ )*)(![^ ]+ )?(.+)'
,
r'\1-\3'
,
connection_string_dict
[
'cmf_activity_sql_connection_string'
]))
if
os
.
environ
.
get
(
connection
,
connection_string
):
connection_string_dict
[
connection
]
=
\
os
.
environ
.
get
(
connection
,
'-'
+
connection_string
)
return
connection_string_dict
def
_getConversionServerUrlList
():
...
...
This diff is collapsed.
Click to expand it.
product/ERP5Type/tests/runUnitTest.py
View file @
b393845b
...
...
@@ -65,7 +65,7 @@ Options:
--cmf_activity_sql_connection_string=STRING
ZSQL Connection string for
cmf_activity_sql_connection (if unset, defaults to
erp5_sql_connection_string
with "!READ-COMMITTED"
)
erp5_sql_connection_string)
--extra_sql_connection_string_list=STRING
Used when 2 or more ZSQL connection strings are
needed. By defaut, it will take the last four
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment