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
Titouan Soulard
erp5
Commits
93b5fe3c
Commit
93b5fe3c
authored
Oct 28, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
full text: we only support the first full text score in select dict.
parent
e4261ba1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
product/ZSQLCatalog/SQLExpression.py
product/ZSQLCatalog/SQLExpression.py
+3
-0
No files found.
product/ZSQLCatalog/SQLExpression.py
View file @
93b5fe3c
...
@@ -334,6 +334,9 @@ class SQLExpression(object):
...
@@ -334,6 +334,9 @@ class SQLExpression(object):
if
can_merge_sql_expression
and
alias
in
mergeable_set
:
if
can_merge_sql_expression
and
alias
in
mergeable_set
:
# Custom conflict resolution
# Custom conflict resolution
column
=
'%s + %s'
%
(
existing_value
,
column
)
column
=
'%s + %s'
%
(
existing_value
,
column
)
elif
alias
.
endswith
(
'__score__'
):
# We only support the first full text score in select dict.
pass
else
:
else
:
message
=
'%r is a known alias for column %r, can
\
'
t alias it now to column %r'
%
(
alias
,
existing_value
,
column
)
message
=
'%r is a known alias for column %r, can
\
'
t alias it now to column %r'
%
(
alias
,
existing_value
,
column
)
if
DEBUG
:
if
DEBUG
:
...
...
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