Merge "tp: Fix table functions pattern" into main
diff --git a/python/generators/sql_processing/utils.py b/python/generators/sql_processing/utils.py
index 1a76e1f..f7d733d 100644
--- a/python/generators/sql_processing/utils.py
+++ b/python/generators/sql_processing/utils.py
@@ -70,7 +70,7 @@
fr" \( ({ARGS}) \) "
# Type: table definition after RETURNS.
fr"({COMMENTS})"
- fr" RETURNS TABLE\( ({ARGS}) \) AS ")
+ fr" RETURNS TABLE \( ({ARGS}) \) AS ")
CREATE_MACRO_PATTERN = update_pattern(
fr"CREATE (OR REPLACE)? PERFETTO MACRO ({NAME}) "
diff --git a/tools/check_sql_modules.py b/tools/check_sql_modules.py
index c09261b..ff21b4f 100755
--- a/tools/check_sql_modules.py
+++ b/tools/check_sql_modules.py
@@ -83,9 +83,6 @@
if not pattern.match(rel_path):
continue
- if args.verbose:
- print(f'Parsing {rel_path}:')
-
with open(path, 'r') as f:
sql = f.read()
@@ -98,10 +95,13 @@
modules.append((path, sql, parsed))
if args.verbose:
- function_count = len(parsed.functions) + len(parsed.table_functions)
- print(f'Parsed {function_count} functions'
- f', {len(parsed.table_views)} tables/views'
- f' ({len(parsed.errors)} errors).')
+ obj_count = len(parsed.functions) + len(parsed.table_functions) + len(
+ parsed.table_views) + len(parsed.macros)
+ print(
+ f"""Parsing '{rel_path}' ({obj_count} objects, {len(parsed.errors)} errors)
+- {len(parsed.functions)} functions + {len(parsed.table_functions)} table functions,
+- {len(parsed.table_views)} tables/views,
+- {len(parsed.macros)} macros.""")
for path, sql, parsed in modules:
lines = [l.strip() for l in sql.split('\n')]
