Skip to content

erp5
erp5
Commit eba947b4 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Update ZSQL method indentation. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26445 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent feb19f6a
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 139 deletions
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
View file @ eba947b4
...@@ -94,10 +94,10 @@ ...@@ -94,10 +94,10 @@
</item> </item>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>language\n <value> <string>language\r\n
all_languages\n all_languages\r\n
all_versions\n all_versions\r\n
validation_state:list\n validation_state:list\r\n
kw</string> </value> kw</string> </value>
</item> </item>
<item> <item>
...@@ -143,74 +143,88 @@ kw</string> </value> ...@@ -143,74 +143,88 @@ kw</string> </value>
is_translation_order_by="query[\'order_by_expression\'] is not None and\n is_translation_order_by="query[\'order_by_expression\'] is not None and\n
\'translated_message\' in query[\'order_by_expression\']">\n \'translated_message\' in query[\'order_by_expression\']">\n
\n \n
<dtml-comment>\n <dtml-comment>\n
Currently, there is no other choice to implement this method as an SQL catalog until SQLCatalog \n Currently, there is no other choice to implement this method as an SQL catalog until SQLCatalog\n
can support more features which are needed here. Once SQLCatalog supports those feature, \n can support more features which are needed here. Once SQLCatalog supports those feature,\n
this method should be refactored to use catalog only.\n this method should be refactored to use catalog only.\n
\n
The subquery is named catalog to prevent use another LEFT JOIN.\n
</dtml-comment>\n
\n \n
SELECT\n The subquery is named catalog to prevent use another LEFT JOIN.\n
catalog.path AS path, catalog.uid AS uid, catalog.modification_date,\n </dtml-comment>\n
catalog.reference, catalog.int_index, catalog.creation_date , catalog.title, \n \n
catalog.priority\n SELECT\n
<dtml-if is_translation_order_by> \n catalog.path AS path,\n
,catalog.translated_message\n catalog.uid AS uid,\n
</dtml-if>\n catalog.modification_date,\n
catalog.reference,\n
catalog.int_index,\n
catalog.creation_date,\n
catalog.title,\n
catalog.priority\n
<dtml-if is_translation_order_by>\n
, catalog.translated_message\n
</dtml-if>\n
\n \n
FROM\n FROM\n
(\n (\n
SELECT\n SELECT\n
catalog.uid, catalog.path, catalog.int_index, catalog.modification_date,\n catalog.uid,\n
catalog.reference, my_versioning.language, my_versioning.version,\n catalog.path,\n
catalog.creation_date, catalog.title\n catalog.int_index,\n
, MAX(CONCAT(CASE my_versioning.language\n catalog.modification_date,\n
WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n catalog.reference,\n
WHEN \'en\' THEN \'2\'\n my_versioning.language,\n
ELSE \'1\' END,\n my_versioning.version,\n
my_versioning.version)) AS priority\n catalog.creation_date,\n
<dtml-if is_translation_order_by>\n catalog.title,\n
,related_translation_intermediate.translated_message\n MAX(CONCAT(CASE my_versioning.language\n
</dtml-if>\n WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
FROM\n WHEN \'en\' THEN \'2\'\n
<dtml-in prefix="table" expr="query[\'from_table_list\']">\n ELSE \'1\' END,\n
my_versioning.version)) AS priority\n
<dtml-if is_translation_order_by>\n
, related_translation_intermediate.translated_message\n
</dtml-if>\n
FROM\n
<dtml-in prefix="table" expr="query[\'from_table_list\']">\n
<dtml-var table_item> AS <dtml-var table_key>,\n <dtml-var table_item> AS <dtml-var table_key>,\n
</dtml-in>\n </dtml-in>\n
versioning AS my_versioning\n versioning AS my_versioning\n
<dtml-if is_translation_order_by>\n <dtml-if is_translation_order_by>\n
,translation AS related_translation_intermediate\n , translation AS related_translation_intermediate\n
</dtml-if>\n </dtml-if>\n
WHERE\n WHERE\n
my_versioning.uid = catalog.uid\n my_versioning.uid = catalog.uid\n
<dtml-if "query[\'where_expression\']">\n <dtml-if "query[\'where_expression\']">\n
AND <dtml-var "query[\'where_expression\']">\n AND <dtml-var "query[\'where_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-if all_languages>\n \n
<dtml-if all_languages>\n
<dtml-else>\n
AND my_versioning.language = <dtml-sqlvar language type="string">\n
</dtml-if>\n
\n
GROUP BY\n
catalog.uid\n
ORDER BY\n
priority DESC\n
) AS catalog,\n
versioning AS my_versioning\n
\n \n
<dtml-else>\n WHERE\n
AND my_versioning.language = <dtml-sqlvar language type="string"> \n catalog.uid = my_versioning.uid\n
</dtml-if>\n <dtml-if all_versions>\n
GROUP BY\n GROUP BY\n
catalog.uid\n catalog.uid\n
ORDER BY\n <dtml-else>\n
priority DESC\n
) AS catalog, versioning AS my_versioning\n
WHERE\n
catalog.uid = my_versioning.uid\n
<dtml-if all_versions>\n
GROUP BY\n GROUP BY\n
catalog.uid\n catalog.reference\n
<dtml-else>\n HAVING\n
GROUP BY\n MAX(CONCAT(CASE my_versioning.language\n
catalog.reference\n WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
HAVING \n WHEN \'en\' THEN \'2\'\n
MAX(CONCAT(CASE my_versioning.language\n ELSE \'1\' END,\n
WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n my_versioning.version)) = catalog.priority\n
WHEN \'en\' THEN \'2\'\n </dtml-if>\n
ELSE \'1\' END,\n
my_versioning.version)) = catalog.priority\n
</dtml-if>\n
\n \n
ORDER BY\n ORDER BY\n
<dtml-if "query[\'order_by_expression\']">\n <dtml-if "query[\'order_by_expression\']">\n
...@@ -220,15 +234,18 @@ FROM\n ...@@ -220,15 +234,18 @@ FROM\n
<dtml-var "query[\'order_by_expression\']">\n <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-else>\n <dtml-else>\n
catalog.int_index, catalog.reference\n catalog.int_index,\n
catalog.reference\n
</dtml-if>\n </dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n
LIMIT 1000\n
</dtml-if>\n
\n \n
</dtml-let> <dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n
LIMIT 1000\n
</dtml-if>\n
\n
</dtml-let>\n
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -273,74 +290,88 @@ FROM\n ...@@ -273,74 +290,88 @@ FROM\n
is_translation_order_by="query[\'order_by_expression\'] is not None and\n is_translation_order_by="query[\'order_by_expression\'] is not None and\n
\'translated_message\' in query[\'order_by_expression\']">\n \'translated_message\' in query[\'order_by_expression\']">\n
\n \n
<dtml-comment>\n <dtml-comment>\n
Currently, there is no other choice to implement this method as an SQL catalog until SQLCatalog \n Currently, there is no other choice to implement this method as an SQL catalog until SQLCatalog\n
can support more features which are needed here. Once SQLCatalog supports those feature, \n can support more features which are needed here. Once SQLCatalog supports those feature,\n
this method should be refactored to use catalog only.\n this method should be refactored to use catalog only.\n
\n
The subquery is named catalog to prevent use another LEFT JOIN.\n
</dtml-comment>\n
\n \n
SELECT\n The subquery is named catalog to prevent use another LEFT JOIN.\n
catalog.path AS path, catalog.uid AS uid, catalog.modification_date,\n </dtml-comment>\n
catalog.reference, catalog.int_index, catalog.creation_date , catalog.title, \n \n
catalog.priority\n SELECT\n
<dtml-if is_translation_order_by> \n catalog.path AS path,\n
,catalog.translated_message\n catalog.uid AS uid,\n
</dtml-if>\n catalog.modification_date,\n
catalog.reference,\n
catalog.int_index,\n
catalog.creation_date,\n
catalog.title,\n
catalog.priority\n
<dtml-if is_translation_order_by>\n
, catalog.translated_message\n
</dtml-if>\n
\n \n
FROM\n FROM\n
(\n (\n
SELECT\n SELECT\n
catalog.uid, catalog.path, catalog.int_index, catalog.modification_date,\n catalog.uid,\n
catalog.reference, my_versioning.language, my_versioning.version,\n catalog.path,\n
catalog.creation_date, catalog.title\n catalog.int_index,\n
, MAX(CONCAT(CASE my_versioning.language\n catalog.modification_date,\n
WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n catalog.reference,\n
WHEN \'en\' THEN \'2\'\n my_versioning.language,\n
ELSE \'1\' END,\n my_versioning.version,\n
my_versioning.version)) AS priority\n catalog.creation_date,\n
<dtml-if is_translation_order_by>\n catalog.title,\n
,related_translation_intermediate.translated_message\n MAX(CONCAT(CASE my_versioning.language\n
</dtml-if>\n WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
FROM\n WHEN \'en\' THEN \'2\'\n
<dtml-in prefix="table" expr="query[\'from_table_list\']">\n ELSE \'1\' END,\n
my_versioning.version)) AS priority\n
<dtml-if is_translation_order_by>\n
, related_translation_intermediate.translated_message\n
</dtml-if>\n
FROM\n
<dtml-in prefix="table" expr="query[\'from_table_list\']">\n
<dtml-var table_item> AS <dtml-var table_key>,\n <dtml-var table_item> AS <dtml-var table_key>,\n
</dtml-in>\n </dtml-in>\n
versioning AS my_versioning\n versioning AS my_versioning\n
<dtml-if is_translation_order_by>\n <dtml-if is_translation_order_by>\n
,translation AS related_translation_intermediate\n , translation AS related_translation_intermediate\n
</dtml-if>\n </dtml-if>\n
WHERE\n WHERE\n
my_versioning.uid = catalog.uid\n my_versioning.uid = catalog.uid\n
<dtml-if "query[\'where_expression\']">\n <dtml-if "query[\'where_expression\']">\n
AND <dtml-var "query[\'where_expression\']">\n AND <dtml-var "query[\'where_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-if all_languages>\n \n
<dtml-if all_languages>\n
<dtml-else>\n
AND my_versioning.language = <dtml-sqlvar language type="string">\n
</dtml-if>\n
\n
GROUP BY\n
catalog.uid\n
ORDER BY\n
priority DESC\n
) AS catalog,\n
versioning AS my_versioning\n
\n \n
<dtml-else>\n WHERE\n
AND my_versioning.language = <dtml-sqlvar language type="string"> \n catalog.uid = my_versioning.uid\n
</dtml-if>\n <dtml-if all_versions>\n
GROUP BY\n GROUP BY\n
catalog.uid\n catalog.uid\n
ORDER BY\n <dtml-else>\n
priority DESC\n
) AS catalog, versioning AS my_versioning\n
WHERE\n
catalog.uid = my_versioning.uid\n
<dtml-if all_versions>\n
GROUP BY\n GROUP BY\n
catalog.uid\n catalog.reference\n
<dtml-else>\n HAVING\n
GROUP BY\n MAX(CONCAT(CASE my_versioning.language\n
catalog.reference\n WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n
HAVING \n WHEN \'en\' THEN \'2\'\n
MAX(CONCAT(CASE my_versioning.language\n ELSE \'1\' END,\n
WHEN <dtml-sqlvar language type="string"> THEN \'3\'\n my_versioning.version)) = catalog.priority\n
WHEN \'en\' THEN \'2\'\n </dtml-if>\n
ELSE \'1\' END,\n
my_versioning.version)) = catalog.priority\n
</dtml-if>\n
\n \n
ORDER BY\n ORDER BY\n
<dtml-if "query[\'order_by_expression\']">\n <dtml-if "query[\'order_by_expression\']">\n
...@@ -350,15 +381,18 @@ FROM\n ...@@ -350,15 +381,18 @@ FROM\n
<dtml-var "query[\'order_by_expression\']">\n <dtml-var "query[\'order_by_expression\']">\n
</dtml-if>\n </dtml-if>\n
<dtml-else>\n <dtml-else>\n
catalog.int_index, catalog.reference\n catalog.int_index,\n
catalog.reference\n
</dtml-if>\n </dtml-if>\n
<dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n
LIMIT 1000\n
</dtml-if>\n
\n \n
</dtml-let> <dtml-if "query[\'limit_expression\']">\n
LIMIT <dtml-var "query[\'limit_expression\']">\n
<dtml-else>\n
LIMIT 1000\n
</dtml-if>\n
\n
</dtml-let>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_web/bt/revision
View file @ eba947b4
777 779
\ No newline at end of file \ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7