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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
erp5
Commits
928274e1
Commit
928274e1
authored
Nov 21, 2023
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! ZMySQLDA: support isolation level per connector.
parent
89f517c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
product/ERP5/ERP5Site.py
product/ERP5/ERP5Site.py
+2
-2
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+1
-2
No files found.
product/ERP5/ERP5Site.py
View file @
928274e1
...
...
@@ -50,6 +50,7 @@ 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
...
...
@@ -2291,8 +2292,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'
:
index
=
[
i
for
i
,
x
in
enumerate
(
p
.
cmf_activity_sql_connection_string
.
split
())
if
not
x
[
0
]
in
(
'%'
,
'*'
,
'!'
)][
0
]
connection_string
=
' '
.
join
(
'-'
+
x
if
i
==
index
else
x
for
i
,
x
in
enumerate
(
p
.
cmf_activity_sql_connection_string
.
split
()))
connection_string
=
'-'
+
re
.
sub
(
r'^([%*!][^ ]+ )*[+-]?'
,
''
,
p
.
cmf_activity_sql_connection_string
)
else
:
connection_string
=
getattr
(
p
,
id
+
'_string'
)
manage_add
(
id
,
title
,
connection_string
,
**
kw
)
...
...
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
928274e1
...
...
@@ -110,9 +110,8 @@ def _getConnectionStringDict():
connection_string_dict
[
connection
]
=
connection_string
connection
=
'erp5_sql_transactionless_connection_string'
if
os
.
environ
.
get
(
connection
,
connection_string
):
index
=
[
i
for
i
,
x
in
enumerate
(
connection_string
.
split
())
if
not
x
[
0
]
in
(
'%'
,
'*'
,
'!'
)][
0
]
connection_string_dict
[
connection
]
=
\
connection_string
=
' '
.
join
(
'-'
+
x
if
i
==
index
else
x
for
i
,
x
in
enumerate
(
connection_string
.
split
())
)
os
.
environ
.
get
(
connection
,
'-'
+
re
.
sub
(
r'^([%*!][^ ]+ )*[+-]?'
,
''
,
connection_string
)
return
connection_string_dict
def
_getConversionServerUrlList
():
...
...
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