Commit ce2a342d authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

SQLCatalog: invoke z_catalog_object_list first to guarantee non-SELECT query first.

parent 4f133d81
...@@ -1278,9 +1278,6 @@ class Catalog(Folder, ...@@ -1278,9 +1278,6 @@ class Catalog(Folder,
check_uid=check_uid, check_uid=check_uid,
idxs=idxs) idxs=idxs)
def getSqlCatalogObjectListList(self):
return self.sql_catalog_object_list
def _catalogObjectList(self, object_list, method_id_list=None, def _catalogObjectList(self, object_list, method_id_list=None,
disable_cache=0, check_uid=1, idxs=None): disable_cache=0, check_uid=1, idxs=None):
"""This is the real method to catalog objects.""" """This is the real method to catalog objects."""
...@@ -2469,8 +2466,14 @@ class Catalog(Folder, ...@@ -2469,8 +2466,14 @@ class Catalog(Folder,
return () return ()
def getSqlCatalogObjectListList(self): def getSqlCatalogObjectListList(self):
# put z_catalog_object_list first to guarantee non-SELECT query first.
try: try:
return self.sql_catalog_object_list return tuple(
sorted(
self.sql_catalog_object_list,
key=lambda e: e != 'z_catalog_object_list'
)
)
except AttributeError: except AttributeError:
return () return ()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment