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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
erp5
Commits
071e4b1a
Commit
071e4b1a
authored
Aug 25, 2017
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZSQLCatalog: Move catalog table registration out of ColumnMap.
registerCatalog method must be avoided whenever possible.
parent
058178f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
product/ZSQLCatalog/ColumnMap.py
product/ZSQLCatalog/ColumnMap.py
+0
-1
product/ZSQLCatalog/Query/EntireQuery.py
product/ZSQLCatalog/Query/EntireQuery.py
+3
-0
No files found.
product/ZSQLCatalog/ColumnMap.py
View file @
071e4b1a
...
@@ -416,7 +416,6 @@ class ColumnMap(object):
...
@@ -416,7 +416,6 @@ class ColumnMap(object):
# now that we have all aliases, calculate missing joins comming from
# now that we have all aliases, calculate missing joins comming from
# non-RelatedKey relationships (like full_text).
# non-RelatedKey relationships (like full_text).
self
.
registerCatalog
()
self
.
_calculateMissingJoins
()
self
.
_calculateMissingJoins
()
# and all left joins that did not come from explicit queries
# and all left joins that did not come from explicit queries
# (i.e. joins comming from 'sort_on', 'select_dict', etc.)
# (i.e. joins comming from 'sort_on', 'select_dict', etc.)
...
...
product/ZSQLCatalog/Query/EntireQuery.py
View file @
071e4b1a
...
@@ -96,6 +96,9 @@ class EntireQuery(object):
...
@@ -96,6 +96,9 @@ class EntireQuery(object):
)
)
self
.
column_map
=
column_map
self
.
column_map
=
column_map
if
1
:
if
1
:
column_map
.
registerTable
(
self
.
catalog_table_name
,
)
for
extra_column
in
self
.
extra_column_list
:
for
extra_column
in
self
.
extra_column_list
:
table
,
column
=
extra_column
.
replace
(
'`'
,
''
).
split
(
'.'
)
table
,
column
=
extra_column
.
replace
(
'`'
,
''
).
split
(
'.'
)
if
table
!=
self
.
catalog_table_name
:
if
table
!=
self
.
catalog_table_name
:
...
...
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