Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
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
Romain Courteaud
erp5_rtl_support
Commits
3e2677c2
Commit
3e2677c2
authored
Nov 08, 2011
by
Leonardo Rochael Almeida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment and docstring typos
parent
93cf49e4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
product/ZSQLCatalog/ColumnMap.py
product/ZSQLCatalog/ColumnMap.py
+1
-1
product/ZSQLCatalog/TableDefinition.py
product/ZSQLCatalog/TableDefinition.py
+6
-4
No files found.
product/ZSQLCatalog/ColumnMap.py
View file @
3e2677c2
...
@@ -680,7 +680,7 @@ class ColumnMap(object):
...
@@ -680,7 +680,7 @@ class ColumnMap(object):
catalog_table_alias
=
self
.
getCatalogTableAlias
()
catalog_table_alias
=
self
.
getCatalogTableAlias
()
for
(
group
,
table_name
),
column_set
in
self
.
join_table_map
.
items
():
for
(
group
,
table_name
),
column_set
in
self
.
join_table_map
.
items
():
# if any of the columns for this implicit join was requested as a
# if any of the columns for this implicit join was requested as a
#left-join, then all columns will be subject to a left-join.
#
left-join, then all columns will be subject to a left-join.
# XXX What if one of the columns was an actual query, as opposed to a
# XXX What if one of the columns was an actual query, as opposed to a
# sort column or select_dict? This would cause results in the main
# sort column or select_dict? This would cause results in the main
# catalog that don't match the query to be present as well. We expect
# catalog that don't match the query to be present as well. We expect
...
...
product/ZSQLCatalog/TableDefinition.py
View file @
3e2677c2
...
@@ -80,7 +80,7 @@ class TableDefinition(object):
...
@@ -80,7 +80,7 @@ class TableDefinition(object):
def getSuperSet(self, other):
def getSuperSet(self, other):
"""
Checks
if
this
TableDefinition
is
a
subset
of
the
other
table
"""
Checks
if
this
TableDefinition
is
a
subset
of
the
other
table
definition
or
vice
-
versa
.
definition
or
vice
-
versa
.
Return
which
one
is
the
superset
.
Returns
whichever
is
the
superset
of
the
other
or
None
Returns
whichever
is
the
superset
of
the
other
or
None
"""
"""
...
@@ -232,15 +232,17 @@ class InnerJoin(Join):
...
@@ -232,15 +232,17 @@ class InnerJoin(Join):
- other is a TableAlias (or None) equal to our
- other is a TableAlias (or None) equal to our
left_side. I.e. "other" is at the end of it's inner-join chain.
left_side. I.e. "other" is at the end of it's inner-join chain.
- other is an InnerJoin, and it's left-side is equal to our left-side (both TableAliases or None), and it's righ
- other is an InnerJoin, and it's left-side is equal to our
left-side (both TableAliases or None), and our right-side is a
super-set of it's right-side.
"""
"""
if
self
.
left_tabledef
==
other
:
if
self
.
left_tabledef
==
other
:
# other and left-side are both None or TableAliases
# other and left-side are both None or
matching
TableAliases
return
self
return
self
if
(
isinstance
(
other
,
InnerJoin
)
and
if
(
isinstance
(
other
,
InnerJoin
)
and
self
.
left_tabledef
==
other
.
left_tabledef
):
self
.
left_tabledef
==
other
.
left_tabledef
):
# our left-sides match. If one of our right sides is a superset of the
# our left-sides match. If one of our right sides is a superset of the
# other
, then one of is is
the superset
# other
right side, then we found
the superset
sub_superset
=
self
.
right_tabledef
.
getSuperSet
(
other
.
right_tabledef
)
sub_superset
=
self
.
right_tabledef
.
getSuperSet
(
other
.
right_tabledef
)
if
sub_superset
is
self
.
right_tabledef
:
if
sub_superset
is
self
.
right_tabledef
:
return
self
return
self
...
...
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