diff --git a/src/db_sub_source.cc b/src/db_sub_source.cc index 1f6408a0..afc84cc1 100644 --- a/src/db_sub_source.cc +++ b/src/db_sub_source.cc @@ -191,6 +191,9 @@ db_label_source::push_header(const std::string& colstr, hm.hm_column_size = utf8_string_length(colstr).unwrapOr(colstr.length()); hm.hm_column_type = type; hm.hm_graphable = graphable; + if (graphable) { + hm.hm_column_size = std::max(hm.hm_column_size, size_t{10}); + } if (colstr == "log_time" || colstr == "min(log_time)") { this->dls_time_column_index = this->dls_headers.size() - 1; } @@ -464,7 +467,8 @@ db_overlay_source::list_static_overlay(const listview_curses& lv, auto actual_col_size = std::min(dls->dls_max_column_width, dls->dls_headers[lpc].hm_column_size); std::string cell_title = dls->dls_headers[lpc].hm_name; - + string_attrs_t cell_attrs; + scrub_ansi_string(cell_title, &cell_attrs); truncate_to(cell_title, dls->dls_max_column_width); auto cell_length @@ -475,12 +479,13 @@ db_overlay_source::list_static_overlay(const listview_curses& lv, before = total_fill / 2; total_fill -= before; line.append(before, ' '); + shift_string_attrs(cell_attrs, 0, line.size()); line.append(cell_title); line.append(total_fill, ' '); - line.append(1, ' '); - struct line_range header_range(line_len_before, line.length()); + line.append(1, ' '); + require_ge(header_range.lr_start, 0); text_attrs attrs; @@ -491,6 +496,7 @@ db_overlay_source::list_static_overlay(const listview_curses& lv, attrs.ta_attrs = A_UNDERLINE; } sa.emplace_back(header_range, VC_STYLE.value(attrs)); + sa.insert(sa.end(), cell_attrs.begin(), cell_attrs.end()); } struct line_range lr(0); diff --git a/src/internals/sql-ref.rst b/src/internals/sql-ref.rst index 083a7f6f..38e6b413 100644 --- a/src/internals/sql-ref.rst +++ b/src/internals/sql-ref.rst @@ -1339,34 +1339,34 @@ generate_series(*start*, *stop*, *\[step\]*) .. code-block:: custsqlite ;SELECT value FROM generate_series(10, 14) - value - 10 - 11 - 12 - 13 - 14 + value + 10 + 11 + 12 + 13 + 14 To generate every other number in the range [10, 14]: .. code-block:: custsqlite ;SELECT value FROM generate_series(10, 14, 2) - value - 10 - 12 - 14 + value + 10 + 12 + 14 To count down from five to 1: .. code-block:: custsqlite ;SELECT value FROM generate_series(1, 5, -1) - value - 5 - 4 - 3 - 2 - 1 + value + 5 + 4 + 3 + 2 + 1 ---- @@ -3656,11 +3656,11 @@ row_number() .. code-block:: custsqlite ;SELECT row_number() OVER (PARTITION BY ex_procname ORDER BY log_line) AS msg_num, ex_procname, log_body FROM lnav_example_log - msg_num ex_procname log_body - 1 gw Goodbye, World! - 2 gw Goodbye, World! - 3 gw Goodbye, World! - 1 hw Hello, World! + msg_num ex_procname log_body + 1 gw Goodbye, World! + 2 gw Goodbye, World! + 3 gw Goodbye, World! + 1 hw Hello, World! **See Also** :ref:`cume_dist`, :ref:`dense_rank`, :ref:`first_value`, :ref:`lag`, :ref:`last_value`, :ref:`lead`, :ref:`nth_value`, :ref:`ntile`, :ref:`percent_rank`, :ref:`rank` @@ -4189,19 +4189,19 @@ timeslice(*time*, *slice*) ;SELECT timeslice(log_time_msecs, '5m') AS slice, count(1) FROM lnav_example_log GROUP BY slice - slice count(1) - 2017-02⋯:00.000 2 - 2017-02⋯:00.000 1 - 2017-02⋯:00.000 1 + slice count(1) + 2017-02⋯:00.000 2 + 2017-02⋯:00.000 1 + 2017-02⋯:00.000 1 To group log messages by those before 4:30am and after: .. code-block:: custsqlite ;SELECT timeslice(log_time_msecs, 'before 4:30am') AS slice, count(1) FROM lnav_example_log GROUP BY slice - slice count(1) - 1 - 2017-02⋯:00.000 3 + slice count(1) + 1 + 2017-02⋯:00.000 3 **See Also** :ref:`date`, :ref:`datetime`, :ref:`humanize_duration`, :ref:`julianday`, :ref:`strftime`, :ref:`time`, :ref:`timediff`, :ref:`timezone` @@ -4611,9 +4611,9 @@ derive *column* .. code-block:: custsqlite ;from [{a=1}, {a=2}] | derive b = a * 2 - a b - 1 2 - 2 4 + a b + 1 2 + 2 4 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4661,19 +4661,19 @@ from *table* .. code-block:: custsqlite ;from http_status_codes | take 3 - status message - 100 Continue - 101 Switchi⋯otocols - 102 Processing + status message + 100 Continue + 101 Switchi⋯otocols + 102 Processing To use an array literal as a source: .. code-block:: custsqlite ;from [{ col1=1, col2='abc' }, { col1=2, col2='def' }] - col1 col2 - 1 abc - 2 def + col1 col2 + 1 abc + 2 def **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4698,11 +4698,11 @@ group *key_columns* *pipeline* .. code-block:: custsqlite ;from lnav_example_log | group { log_level } (aggregate { count this }) - log_level COUNT(*) - debug 1 - info 1 - warn 1 - error 1 + log_level COUNT(*) + debug 1 + info 1 + warn 1 + error 1 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4753,9 +4753,9 @@ select *expr* .. code-block:: custsqlite ;from [{a=1}, {a=2}] | select b = a * 2 - b - 2 - 4 + b + 2 + 4 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4779,9 +4779,9 @@ sort *expr* .. code-block:: custsqlite ;from [{a=1}, {a=2}] | sort {-a} - a - 2 - 1 + a + 2 + 1 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4830,9 +4830,9 @@ stats.by *col* *values* .. code-block:: custsqlite ;from [{a=1, b=1}, {a=1, b=1}, {a=2, b=1}] | stats.by a {sum b} - a COALESC⋯(b), 0) - 1 2 - 2 1 + a COALESC⋯(b), 0) + 1 2 + 2 1 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4856,9 +4856,9 @@ stats.count_by *column* .. code-block:: custsqlite ;from [{a=1}, {a=1}, {a=2}] | stats.count_by a - a total - 1 2 - 2 1 + a total + 1 2 + 2 1 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4941,9 +4941,9 @@ take *n_or_range* .. code-block:: custsqlite ;from [{a=1}, {a=2}, {a=3}] | take 2..3 - a - 2 - 3 + a + 2 + 3 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of`, :ref:`utils_distinct` @@ -4967,9 +4967,9 @@ utils.distinct *col* .. code-block:: custsqlite ;from [{a=1}, {a=1}, {a=2}] | utils.distinct a - a - 1 - 2 + a + 1 + 2 **See Also** :ref:`prql_aggregate`, :ref:`prql_append`, :ref:`prql_derive`, :ref:`prql_filter`, :ref:`prql_from`, :ref:`prql_group`, :ref:`prql_join`, :ref:`prql_select`, :ref:`prql_sort`, :ref:`prql_take`, :ref:`stats_average_of`, :ref:`stats_by`, :ref:`stats_count_by`, :ref:`stats_hist`, :ref:`stats_sum_of` diff --git a/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out b/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out index aea936f0..2db5d3c4 100644 --- a/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out +++ b/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out @@ -1,2 +1,2 @@ -filepath lines  -stdin  4 +filepath  lines   +stdin  4 diff --git a/test/expected/test_cmds.sh_7cb644890c4b945ff3f1e15c86a58c85cb5425c0.out b/test/expected/test_cmds.sh_7cb644890c4b945ff3f1e15c86a58c85cb5425c0.out index 7ad9d781..63775599 100644 --- a/test/expected/test_cmds.sh_7cb644890c4b945ff3f1e15c86a58c85cb5425c0.out +++ b/test/expected/test_cmds.sh_7cb644890c4b945ff3f1e15c86a58c85cb5425c0.out @@ -1,5 +1,5 @@ -┏━━┳━━━━━━━━━━━━━┓ -┃c1┃ c2 ┃ -┡━━╇━━━━━━━━━━━━━┩ -│ 1│Hello, World!│ -└━━┴━━━━━━━━━━━━━┘ +┏━━━━━━━━━━┳━━━━━━━━━━━━━┓ +┃ c1 ┃ c2 ┃ +┡━━━━━━━━━━╇━━━━━━━━━━━━━┩ +│ 1│Hello, World!│ +└━━━━━━━━━━┴━━━━━━━━━━━━━┘ diff --git a/test/expected/test_cmds.sh_d836c84398c831c976df46f46fe3bf5983c44c37.out b/test/expected/test_cmds.sh_d836c84398c831c976df46f46fe3bf5983c44c37.out index 1d3eae47..926f0f5d 100644 --- a/test/expected/test_cmds.sh_d836c84398c831c976df46f46fe3bf5983c44c37.out +++ b/test/expected/test_cmds.sh_d836c84398c831c976df46f46fe3bf5983c44c37.out @@ -1,2 +1,2 @@ -log_top_line()  +log_top_line()  51 diff --git a/test/expected/test_logfile.sh_218ecb88b4753010c4264b3ac351260b4811612f.out b/test/expected/test_logfile.sh_218ecb88b4753010c4264b3ac351260b4811612f.out index 1a8cc2fb..683602c9 100644 --- a/test/expected/test_logfile.sh_218ecb88b4753010c4264b3ac351260b4811612f.out +++ b/test/expected/test_logfile.sh_218ecb88b4753010c4264b3ac351260b4811612f.out @@ -1,2 +1,2 @@ -basename(filepath)  descriptor  mimetype  content  +basename(filepath)   descriptor   mimetype   content   logfile_syslog.1.gz net.zlib.gzip.header application/json {"name":"logfile_syslog.1","mtime":"2007-11-03T09:23:00.000","comment":""} diff --git a/test/expected/test_logfile.sh_2e72d848a51ac1eb476b973c61fe43a65d579ba5.out b/test/expected/test_logfile.sh_2e72d848a51ac1eb476b973c61fe43a65d579ba5.out index 628b105e..1925cdce 100644 --- a/test/expected/test_logfile.sh_2e72d848a51ac1eb476b973c61fe43a65d579ba5.out +++ b/test/expected/test_logfile.sh_2e72d848a51ac1eb476b973c61fe43a65d579ba5.out @@ -1,2 +1,2 @@ - options_path  options  + options_path   options   {test_dir}/logfile_syslog.0 {"default-zone":"America/Los_Angeles"} diff --git a/test/expected/test_logfile.sh_c18e14a26d8261c9f72747118a469266121d5459.out b/test/expected/test_logfile.sh_c18e14a26d8261c9f72747118a469266121d5459.out index bf43e3cf..0635648c 100644 --- a/test/expected/test_logfile.sh_c18e14a26d8261c9f72747118a469266121d5459.out +++ b/test/expected/test_logfile.sh_c18e14a26d8261c9f72747118a469266121d5459.out @@ -1,3 +1,3 @@ -log_line log_time log_level col_0 col_1 log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters - 0 2021-05-19 08:00:01.000 info 1 /abc/def 0 0 - 2 2021-05-19 08:00:03.000 info 3 /ghi/jkl 2000 0 +log_line log_time log_level col_0 col_1 log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters + 0 2021-05-19 08:00:01.000 info 1 /abc/def 0 0 + 2 2021-05-19 08:00:03.000 info 3 /ghi/jkl 2000 0 diff --git a/test/expected/test_logfile.sh_e840b674cd65936a72bd64b1dac1524d16fe44c3.out b/test/expected/test_logfile.sh_e840b674cd65936a72bd64b1dac1524d16fe44c3.out index a706db24..f551cf02 100644 --- a/test/expected/test_logfile.sh_e840b674cd65936a72bd64b1dac1524d16fe44c3.out +++ b/test/expected/test_logfile.sh_e840b674cd65936a72bd64b1dac1524d16fe44c3.out @@ -1,4 +1,4 @@ - log_time  log_body  + log_time   log_body   2022-09-19 09:24:04.000 tid:1d1f - Mux ID not found in mapping dictionary 2022-09-19 09:24:04.000 tid:1d1f - Can't handle disconnect with invalid ecid 2022-09-19 09:24:20.000 Entered:_AMMuxedDeviceDisconnected, mux-device:1003  diff --git a/test/expected/test_meta.sh_41f643bb4f720130625b042563e9591bee4ae588.out b/test/expected/test_meta.sh_41f643bb4f720130625b042563e9591bee4ae588.out index 171d0f76..d2ad5529 100644 --- a/test/expected/test_meta.sh_41f643bb4f720130625b042563e9591bee4ae588.out +++ b/test/expected/test_meta.sh_41f643bb4f720130625b042563e9591bee4ae588.out @@ -1,2 +1,2 @@ -log_tags  +log_tags  ["#foo"] diff --git a/test/expected/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.out b/test/expected/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.out index 84b2925c..25d62c1e 100644 --- a/test/expected/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.out +++ b/test/expected/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.out @@ -1,2 +1,2 @@ -log_line  log_tags  +log_line  log_tags   46 ["#bro-test"] diff --git a/test/expected/test_meta.sh_aae427fe704f131f8466fbfc9e7967c2e874530a.out b/test/expected/test_meta.sh_aae427fe704f131f8466fbfc9e7967c2e874530a.out index ab3040c6..fc8266d1 100644 --- a/test/expected/test_meta.sh_aae427fe704f131f8466fbfc9e7967c2e874530a.out +++ b/test/expected/test_meta.sh_aae427fe704f131f8466fbfc9e7967c2e874530a.out @@ -1,2 +1,2 @@ -log_line log_annotations  +log_line log_annotations  0 {"abc":"def"} diff --git a/test/expected/test_meta.sh_c75128169049bd88d5eaf8b84a7f617e5ae5d936.out b/test/expected/test_meta.sh_c75128169049bd88d5eaf8b84a7f617e5ae5d936.out index f7f674dc..6f1aae90 100644 --- a/test/expected/test_meta.sh_c75128169049bd88d5eaf8b84a7f617e5ae5d936.out +++ b/test/expected/test_meta.sh_c75128169049bd88d5eaf8b84a7f617e5ae5d936.out @@ -1,4 +1,4 @@ -log_line  log_comment log_tags  +log_line  log_comment  log_tags  0 Hello, World! ["#foo"] 1  2 <NULL>  <NULL>  diff --git a/test/expected/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.out b/test/expected/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.out index 84b2925c..25d62c1e 100644 --- a/test/expected/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.out +++ b/test/expected/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.out @@ -1,2 +1,2 @@ -log_line  log_tags  +log_line  log_tags   46 ["#bro-test"] diff --git a/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out b/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out index 2d7b252b..8b17a016 100644 --- a/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out +++ b/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out @@ -1,2 +1,2 @@ -log_line  log_time log_level  c_ip cs_method cs_referer cs_uri_query  cs_uri_stem cs_user_agent cs_username cs_version sc_bytes sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0  134 200  0 0 +log_line  log_time  log_level  c_ip  cs_method cs_referer cs_uri_query  cs_uri_stem  cs_user_agent cs_username cs_version  sc_bytes  sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  + 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0  134 200  0 0 diff --git a/test/expected/test_sql.sh_0a5d13b62da4cb66a59a51b0240b5fe0b6036b7e.out b/test/expected/test_sql.sh_0a5d13b62da4cb66a59a51b0240b5fe0b6036b7e.out index 386f1e32..332a12e7 100644 --- a/test/expected/test_sql.sh_0a5d13b62da4cb66a59a51b0240b5fe0b6036b7e.out +++ b/test/expected/test_sql.sh_0a5d13b62da4cb66a59a51b0240b5fe0b6036b7e.out @@ -1,2 +1,2 @@ - lnav_top_file()  + lnav_top_file()   {test_dir}/logfile_access_log.0 diff --git a/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out b/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out index 0a1cfc97..a8b3bc81 100644 --- a/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out +++ b/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out @@ -1,2 +1,2 @@ -log_line  log_time log_level  c_ip cs_bytes cs_method cs_uri_query  cs_uri_stem cs_username cs_vars cs_version s_app s_core s_pid s_req s_runtime s_switches s_worker_reqs sc_bytes sc_header_bytes sc_headers sc_status log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2016-03-13 22:49:12.000 info 127.0.0.1  696 POST /update_metrics  38 HTTP/1.1 0 3 88185 1  0.129  1 1  47  378  9 200  0 0 +log_line  log_time  log_level  c_ip   cs_bytes  cs_method cs_uri_query  cs_uri_stem  cs_username  cs_vars  cs_version s_app s_core s_pid s_req s_runtime  s_switches s_worker_reqs  sc_bytes  sc_header_bytes sc_headers sc_status log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  + 0 2016-03-13 22:49:12.000 info 127.0.0.1  696 POST /update_metrics  38 HTTP/1.1 0 3 88185 1  0.129  1 1  47  378  9 200  0 0 diff --git a/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out b/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out index 8b7eb8fc..391a7868 100644 --- a/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out +++ b/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out @@ -1,3 +1,3 @@ -id first_name last_name age  - 0 Phil Myman  30 - 1 Lem Hewitt  35 +id first_name last_name  age   + 0 Phil Myman   30 + 1 Lem Hewitt  35 diff --git a/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out b/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out index 019e044b..29ea19f6 100644 --- a/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out +++ b/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out @@ -1,2 +1,2 @@ -log_top_line() log_msg_line()  +log_top_line() log_msg_line()  1 0 diff --git a/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out b/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out index 8b7eb8fc..391a7868 100644 --- a/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out +++ b/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out @@ -1,3 +1,3 @@ -id first_name last_name age  - 0 Phil Myman  30 - 1 Lem Hewitt  35 +id first_name last_name  age   + 0 Phil Myman   30 + 1 Lem Hewitt  35 diff --git a/test/expected/test_sql.sh_31df37f254255115611fc321b63374a2fa4a1cd5.out b/test/expected/test_sql.sh_31df37f254255115611fc321b63374a2fa4a1cd5.out index 51187211..2f3d6d44 100644 --- a/test/expected/test_sql.sh_31df37f254255115611fc321b63374a2fa4a1cd5.out +++ b/test/expected/test_sql.sh_31df37f254255115611fc321b63374a2fa4a1cd5.out @@ -1,2 +1,2 @@ - replicate('foobar', 120)  + replicate('foobar', 120)   foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar⋯oobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar diff --git a/test/expected/test_sql.sh_62eb85c9569e71a630d72065238559528a16114c.out b/test/expected/test_sql.sh_62eb85c9569e71a630d72065238559528a16114c.out index 898c9a89..0f485fb8 100644 --- a/test/expected/test_sql.sh_62eb85c9569e71a630d72065238559528a16114c.out +++ b/test/expected/test_sql.sh_62eb85c9569e71a630d72065238559528a16114c.out @@ -1,2 +1,2 @@ -filepath  +filepath  foo diff --git a/test/expected/test_sql.sh_753c343a256d1286750314957d1b4e155464e03e.out b/test/expected/test_sql.sh_753c343a256d1286750314957d1b4e155464e03e.out index 801a9afa..069e77a2 100644 --- a/test/expected/test_sql.sh_753c343a256d1286750314957d1b4e155464e03e.out +++ b/test/expected/test_sql.sh_753c343a256d1286750314957d1b4e155464e03e.out @@ -1,2 +1,2 @@ -log_top_datetime()  +log_top_datetime()  diff --git a/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out b/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out index 543f4fda..e3045783 100644 --- a/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out +++ b/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out @@ -1,2 +1,2 @@ -log_top_line() log_msg_line()  +log_top_line() log_msg_line()  2 2 diff --git a/test/expected/test_sql.sh_764306f0e5f610ba71f521ba3d19fe158ece0ba5.out b/test/expected/test_sql.sh_764306f0e5f610ba71f521ba3d19fe158ece0ba5.out index fabc8533..57b6d27b 100644 --- a/test/expected/test_sql.sh_764306f0e5f610ba71f521ba3d19fe158ece0ba5.out +++ b/test/expected/test_sql.sh_764306f0e5f610ba71f521ba3d19fe158ece0ba5.out @@ -1,2 +1,2 @@ - col_0  + col_0   eth0.IPv4 diff --git a/test/expected/test_sql.sh_8ee288f1508eaab0367e465e9f382e848f3282aa.out b/test/expected/test_sql.sh_8ee288f1508eaab0367e465e9f382e848f3282aa.out index fcd872b0..c5c0c0ed 100644 --- a/test/expected/test_sql.sh_8ee288f1508eaab0367e465e9f382e848f3282aa.out +++ b/test/expected/test_sql.sh_8ee288f1508eaab0367e465e9f382e848f3282aa.out @@ -1,4 +1,4 @@ - log_time  + log_time   2009-07-20 22:59:26.000 2009-07-20 22:59:29.000 2009-07-20 22:59:29.000  diff --git a/test/expected/test_sql.sh_ae7b1f1684e14bf9c16e0d789257b6ef57cfb2b1.out b/test/expected/test_sql.sh_ae7b1f1684e14bf9c16e0d789257b6ef57cfb2b1.out index c012bd87..176be31d 100644 --- a/test/expected/test_sql.sh_ae7b1f1684e14bf9c16e0d789257b6ef57cfb2b1.out +++ b/test/expected/test_sql.sh_ae7b1f1684e14bf9c16e0d789257b6ef57cfb2b1.out @@ -1,2 +1,2 @@ - log_time  + log_time   2009-07-20 22:59:26.000 diff --git a/test/expected/test_sql.sh_afe9cdc4898df5c4e112c13dfe3db6dc089c0d7c.out b/test/expected/test_sql.sh_afe9cdc4898df5c4e112c13dfe3db6dc089c0d7c.out index 475b78eb..a44dcbae 100644 --- a/test/expected/test_sql.sh_afe9cdc4898df5c4e112c13dfe3db6dc089c0d7c.out +++ b/test/expected/test_sql.sh_afe9cdc4898df5c4e112c13dfe3db6dc089c0d7c.out @@ -1,4 +1,4 @@ - log_body  + log_body   lookup(file): lookup for foobar failed attempting to mount entry /auto/opt lookup(file): lookup for opt failed  diff --git a/test/expected/test_sql.sh_b085d26043f9661d70f82cb90ecb3c5245d25eac.out b/test/expected/test_sql.sh_b085d26043f9661d70f82cb90ecb3c5245d25eac.out index fcd872b0..c5c0c0ed 100644 --- a/test/expected/test_sql.sh_b085d26043f9661d70f82cb90ecb3c5245d25eac.out +++ b/test/expected/test_sql.sh_b085d26043f9661d70f82cb90ecb3c5245d25eac.out @@ -1,4 +1,4 @@ - log_time  + log_time   2009-07-20 22:59:26.000 2009-07-20 22:59:29.000 2009-07-20 22:59:29.000  diff --git a/test/expected/test_sql.sh_b5aa0561a65de7e8e22085db184c72a94b1a89a9.out b/test/expected/test_sql.sh_b5aa0561a65de7e8e22085db184c72a94b1a89a9.out index c2c44ad0..c1266512 100644 --- a/test/expected/test_sql.sh_b5aa0561a65de7e8e22085db184c72a94b1a89a9.out +++ b/test/expected/test_sql.sh_b5aa0561a65de7e8e22085db184c72a94b1a89a9.out @@ -1,2 +1,2 @@ - log_body  + log_body   timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages diff --git a/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out b/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out index d876b93a..98924168 100644 --- a/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out +++ b/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out @@ -1,4 +1,4 @@ -match_index  content  case match_index when 2 then replicate('abc', 1000) else '' end  +match_index  content   case match_index when 2 then replicate('abc', 1000) else '' end   0 {"col_0":10} 1 {"col_0":50}  2 {"col_0":50} abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc⋯bcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc  diff --git a/test/expected/test_sql.sh_bd46ca4560f8be6307a914e39539bbac0368080a.out b/test/expected/test_sql.sh_bd46ca4560f8be6307a914e39539bbac0368080a.out index 7041f450..f32bdced 100644 --- a/test/expected/test_sql.sh_bd46ca4560f8be6307a914e39539bbac0368080a.out +++ b/test/expected/test_sql.sh_bd46ca4560f8be6307a914e39539bbac0368080a.out @@ -1,2 +1,2 @@ -lnav_top_file()  +lnav_top_file()  diff --git a/test/expected/test_sql.sh_c353ef036c505b75996252138fbd4c8d22e8149c.out b/test/expected/test_sql.sh_c353ef036c505b75996252138fbd4c8d22e8149c.out index fcd872b0..c5c0c0ed 100644 --- a/test/expected/test_sql.sh_c353ef036c505b75996252138fbd4c8d22e8149c.out +++ b/test/expected/test_sql.sh_c353ef036c505b75996252138fbd4c8d22e8149c.out @@ -1,4 +1,4 @@ - log_time  + log_time   2009-07-20 22:59:26.000 2009-07-20 22:59:29.000 2009-07-20 22:59:29.000  diff --git a/test/expected/test_sql.sh_c5b8da04734fadf3b9eea80e0af997e38e0fb811.out b/test/expected/test_sql.sh_c5b8da04734fadf3b9eea80e0af997e38e0fb811.out index 8baf896a..54fad854 100644 --- a/test/expected/test_sql.sh_c5b8da04734fadf3b9eea80e0af997e38e0fb811.out +++ b/test/expected/test_sql.sh_c5b8da04734fadf3b9eea80e0af997e38e0fb811.out @@ -1,3 +1,3 @@ -log_line  col_0  +log_line  col_0   0 eth0.IPv4 7 eth0.IPv4 diff --git a/test/expected/test_sql.sh_c7e1dbf4605914720b55787785abfafdf2c4178a.out b/test/expected/test_sql.sh_c7e1dbf4605914720b55787785abfafdf2c4178a.out index 762b09cb..f3306ab9 100644 --- a/test/expected/test_sql.sh_c7e1dbf4605914720b55787785abfafdf2c4178a.out +++ b/test/expected/test_sql.sh_c7e1dbf4605914720b55787785abfafdf2c4178a.out @@ -1,2 +1,2 @@ - log_top_datetime()  + log_top_datetime()   2016-03-13 22:49:15.000 diff --git a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out index 7dcfcea8..6d2a99ab 100644 --- a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out +++ b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out @@ -1,4 +1,4 @@ -total log_line  log_time duration log_formats  log_msg_format  - 2 0 2007-04-28 06:53:55.000 syslog_log New relevant interface # for # - 2 1 2007-04-28 06:53:55.000 syslog_log Joining # multicast group on interface # with address # - 2  2 2007-04-28 06:53:55.000   syslog_log  Registering new address record for # on #  + total  log_line  log_time  duration log_formats  log_msg_format   + 2 0 2007-04-28 06:53:55.000 syslog_log New relevant interface # for # + 2 1 2007-04-28 06:53:55.000 syslog_log Joining # multicast group on interface # with address # + 2  2 2007-04-28 06:53:55.000   syslog_log  Registering new address record for # on #  diff --git a/test/expected/test_sql.sh_fea98f976873ee7b55e6f322dda42719a19fb3f0.out b/test/expected/test_sql.sh_fea98f976873ee7b55e6f322dda42719a19fb3f0.out index 0cc97753..8307abac 100644 --- a/test/expected/test_sql.sh_fea98f976873ee7b55e6f322dda42719a19fb3f0.out +++ b/test/expected/test_sql.sh_fea98f976873ee7b55e6f322dda42719a19fb3f0.out @@ -1,2 +1,2 @@ -log_top_line() log_msg_line()  +log_top_line() log_msg_line()  diff --git a/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out b/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out index 5930ab0d..f16755c9 100644 --- a/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out +++ b/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out @@ -1,3 +1,3 @@ -log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  1 2009-07-20 22:59:29.000 error null   3000 0 3 2013-02-15 06:00:31.000 error null  112777262000 0 diff --git a/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out b/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out index 174a27eb..240259bb 100644 --- a/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out +++ b/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out @@ -1,4 +1,4 @@ -log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2009-07-20 22:59:26.000 info null  0 0 1 2009-07-20 22:59:29.000 error null   3000 0  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out index 0ffbbc69..a5e2a8e0 100644 --- a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out +++ b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out @@ -1,5 +1,5 @@ -log_line  log_time log_level  c_ip cs_method cs_referer cs_uri_query  cs_uri_stem cs_user_agent cs_username cs_version sc_bytes sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_unique_path  - 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0   134 200  0 0 logfile_access_log.0 - 1 2009-07-20 22:59:29.000 error 192.168.202.254 GET - /vmw/vSphere/default/vmkboot.gz gPXE/0.9.7 - HTTP/1.0  46210 404   3000 0 logfile_access_log.0 - 2 2009-07-20 22:59:29.000 info  192.168.202.254 GET  -   <NULL> /vmw/vSphere/default/vmkernel.gz gPXE/0.9.7  -  HTTP/1.0   78929  200  <NULL>  <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.0  - 3 2013-02-15 06:00:31.000 error  10.112.81.15  <NULL>  -   <NULL> <NULL>  -  -  <NULL>   0  400  <NULL>  <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.1  +log_line  log_time  log_level  c_ip  cs_method cs_referer cs_uri_query  cs_uri_stem  cs_user_agent cs_username cs_version  sc_bytes  sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_unique_path   + 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0   134 200  0 0 logfile_access_log.0 + 1 2009-07-20 22:59:29.000 error 192.168.202.254 GET - /vmw/vSphere/default/vmkboot.gz gPXE/0.9.7 - HTTP/1.0  46210 404   3000 0 logfile_access_log.0 + 2 2009-07-20 22:59:29.000 info  192.168.202.254 GET  -   <NULL> /vmw/vSphere/default/vmkernel.gz gPXE/0.9.7  -  HTTP/1.0   78929  200  <NULL>  <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.0  + 3 2013-02-15 06:00:31.000 error  10.112.81.15  <NULL>  -   <NULL> <NULL>  -  -  <NULL>   0  400  <NULL>  <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.1  diff --git a/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out b/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out index d6cee015..5c73e942 100644 --- a/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out +++ b/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_level < ? +$id  $parent   $notused   replace($detail, 'SCAN TABLE', 'SCAN')   + 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_level < ? diff --git a/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out b/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out index 7e0f2282..c44444c0 100644 --- a/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out +++ b/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out @@ -1,4 +1,4 @@ -log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters log_format  +log_line  log_time  log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters log_format  0 2009-07-20 22:59:26.000 info null  0 0 access_log 1 2009-07-20 22:59:29.000 error null   3000 0 access_log  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> access_log  diff --git a/test/expected/test_sql_indexes.sh_6f707b6e856dbaab6f95e7e89b98dc3652021f85.out b/test/expected/test_sql_indexes.sh_6f707b6e856dbaab6f95e7e89b98dc3652021f85.out index b2fa6e69..8e21b1ba 100644 --- a/test/expected/test_sql_indexes.sh_6f707b6e856dbaab6f95e7e89b98dc3652021f85.out +++ b/test/expected/test_sql_indexes.sh_6f707b6e856dbaab6f95e7e89b98dc3652021f85.out @@ -1,3 +1,3 @@ -log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2009-07-20 22:59:26.000 info null  0 0 2 2009-07-20 22:59:29.000 info null  0 0 diff --git a/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out b/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out index 3379cd86..f56f9041 100644 --- a/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out +++ b/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_format = ? +$id  $parent   $notused   replace($detail, 'SCAN TABLE', 'SCAN')   + 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_format = ? diff --git a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out index 58986f56..7d20aa39 100644 --- a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out +++ b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN access_log VIRTUAL TABLE INDEX 1:SEARCH access_log USING log_path GLOB ? +$id  $parent   $notused   replace($detail, 'SCAN TABLE', 'SCAN')   + 2  0  0 SCAN access_log VIRTUAL TABLE INDEX 1:SEARCH access_log USING log_path GLOB ? diff --git a/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out b/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out index 174a27eb..240259bb 100644 --- a/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out +++ b/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out @@ -1,4 +1,4 @@ -log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2009-07-20 22:59:26.000 info null  0 0 1 2009-07-20 22:59:29.000 error null   3000 0  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out b/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out index cba5ca06..8948203a 100644 --- a/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out +++ b/test/expected/test_sql_regexp.sh_02ef03572fd2bcf39bab8e29cf1c735ff7c3f297.out @@ -1,3 +1,3 @@ -regexp_replace(cs_uri_query, '.*rapidView=(\d+).*', '\1')  +regexp_replace(cs_uri_query, '.*rapidView=(\d+).*', '\1')  1295 1839 diff --git a/test/expected/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.out b/test/expected/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.out index ec3e6da0..50745193 100644 --- a/test/expected/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.out +++ b/test/expected/test_sql_regexp.sh_03257c56e85558aa0cc925b68d3af962afc25125.out @@ -1,4 +1,4 @@ -match_index capture_index capture_name capture_count range_start range_stop content  +match_index capture_index capture_name capture_count range_start range_stop content   0 0 3 1 9 abc=def; 0 1 3 1 4 abc  0  2  <NULL>  3  5  8 def  diff --git a/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out b/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out index df8024ca..dfdbb102 100644 --- a/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out +++ b/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out @@ -1,2 +1,2 @@ -match_index  content  +match_index  content   0 {"key":"foo","value":4670} diff --git a/test/expected/test_sql_regexp.sh_bbd1128cf61a9af8f9dc937b46217443f42e1a7a.out b/test/expected/test_sql_regexp.sh_bbd1128cf61a9af8f9dc937b46217443f42e1a7a.out index bd9b924b..43adbdc7 100644 --- a/test/expected/test_sql_regexp.sh_bbd1128cf61a9af8f9dc937b46217443f42e1a7a.out +++ b/test/expected/test_sql_regexp.sh_bbd1128cf61a9af8f9dc937b46217443f42e1a7a.out @@ -1,2 +1,2 @@ -match_index  content  +match_index  content   0 {"key":"foo","value":"123e"} diff --git a/test/expected/test_sql_regexp.sh_d61af17ff19d640ddfc879460910991825eedd05.out b/test/expected/test_sql_regexp.sh_d61af17ff19d640ddfc879460910991825eedd05.out index 44e3b675..2d39ef59 100644 --- a/test/expected/test_sql_regexp.sh_d61af17ff19d640ddfc879460910991825eedd05.out +++ b/test/expected/test_sql_regexp.sh_d61af17ff19d640ddfc879460910991825eedd05.out @@ -1,2 +1,2 @@ -match_index  content  +match_index  content   0 {"col_0":"abc","col_1":"def"} diff --git a/test/expected/test_sql_regexp.sh_ed6e9f13f178def009ee58c2aeea8c3c70fdb580.out b/test/expected/test_sql_regexp.sh_ed6e9f13f178def009ee58c2aeea8c3c70fdb580.out index 170662d1..ae86ce43 100644 --- a/test/expected/test_sql_regexp.sh_ed6e9f13f178def009ee58c2aeea8c3c70fdb580.out +++ b/test/expected/test_sql_regexp.sh_ed6e9f13f178def009ee58c2aeea8c3c70fdb580.out @@ -1,2 +1,2 @@ -match_index  content  +match_index  content   0 {"key":"foo","value":"0x123e"} diff --git a/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out b/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out index b4d2849d..9a857816 100644 --- a/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out +++ b/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out @@ -1,2 +1,2 @@ -log_line  log_time log_level  comp  opid  tid  user  file  item  line prc reason  req  sid  src  sub vpxa_update match_index  lro_id  entity  operation  SessionId  SessionSubId log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level  comp   opid   tid   user   file   item   line  prc  reason  req   sid   src   sub  vpxa_update match_index  lro_id   entity   operation   SessionId   SessionSubId  log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866  182 0 diff --git a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out index c1dea225..20f031d5 100644 --- a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out +++ b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out @@ -1,4 +1,4 @@ -log_line  log_time log_level match_index  name log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  +log_line  log_time  log_level match_index  name  log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  2 2022-08-16 00:32:15.000 info 0 com.apple.cdscheduler  199000 0 5 2022-08-16 00:32:15.000 info 0 com.apple.install  0 0  8 2022-08-16 00:32:15.000 info   0 com.apple.authd   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out b/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out index 5c1da20e..ed528440 100644 --- a/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out +++ b/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out @@ -1,4 +1,4 @@ -log_line  log_time log_level match_index user  ppid pid cpu_pct mem_pct vsz rss tty stat start_time cpu_time maj_flt min_flt  cmd  cmd_name cmd_args log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0 - 12 2022-06-02 00:02:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 - 30 2022-06-02 00:03:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd] [kthreadd]  <NULL>  <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  +log_line  log_time  log_level match_index user  ppid  pid  cpu_pct   mem_pct   vsz   rss  tty stat start_time cpu_time maj_flt min_flt  cmd   cmd_name  cmd_args log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  + 0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0 + 12 2022-06-02 00:02:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 + 30 2022-06-02 00:03:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd] [kthreadd]  <NULL>  <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out b/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out index eefd7d8f..7fa2742e 100644 --- a/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out +++ b/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out @@ -1,24 +1,24 @@ -log_line  log_time log_level match_index user  ppid pid cpu_pct mem_pct  vsz rss tty stat start_time cpu_time maj_flt min_flt  cmd  cmd_name  cmd_args log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2022-06-02 00:01:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  0 0 - 0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0 - 0 2022-06-02 00:01:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  - 0 2022-06-02 00:01:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  - 0 2022-06-02 00:01:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  0 0 - 12 2022-06-02 00:02:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 - 12 2022-06-02 00:02:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd]  [kthreadd]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info 3 root 4  0  0  0  0 ? I< Jun01 0:00 [rcu_par_gp] [rcu_par_gp]  60000 0 - 12 2022-06-02 00:02:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 - 12 2022-06-02 00:02:01.000 info   5 root <NULL>  8  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [mm_percpu_wq]  [mm_percpu_wq]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info 7 root 10  0  0  0  0 ? I Jun01 0:23 [rcu_sched] [rcu_sched]  60000 0 - 12 2022-06-02 00:02:01.000 info 8 root 11  0  0  0  0 ? I Jun01 0:00 [rcu_bh] [rcu_bh]  60000 0 - 12 2022-06-02 00:02:01.000 info   9 root <NULL>  12  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [migration/0]  [migration/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   10 root <NULL>  14  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [cpuhp/0]  [cpuhp/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 - 30 2022-06-02 00:03:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 - 30 2022-06-02 00:03:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 - 30 2022-06-02 00:03:01.000 info 5 root 8  0  0  0  0 ? I< Jun01 0:00 [mm_percpu_wq] [mm_percpu_wq]  60000 0 - 30 2022-06-02 00:03:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  +log_line  log_time  log_level match_index user  ppid  pid  cpu_pct   mem_pct   vsz   rss  tty stat start_time cpu_time maj_flt min_flt  cmd   cmd_name   cmd_args  log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  + 0 2022-06-02 00:01:01.000 info 0 root 1  0  0  158392  7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  0 0 + 0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0 + 0 2022-06-02 00:01:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  + 0 2022-06-02 00:01:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  + 0 2022-06-02 00:01:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  0 0 + 12 2022-06-02 00:02:01.000 info 0 root 1  0  0  158392  7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 + 12 2022-06-02 00:02:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd]  [kthreadd]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 3 root 4  0  0  0  0 ? I< Jun01 0:00 [rcu_par_gp] [rcu_par_gp]  60000 0 + 12 2022-06-02 00:02:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 + 12 2022-06-02 00:02:01.000 info   5 root <NULL>  8  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [mm_percpu_wq]  [mm_percpu_wq]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 7 root 10  0  0  0  0 ? I Jun01 0:23 [rcu_sched] [rcu_sched]  60000 0 + 12 2022-06-02 00:02:01.000 info 8 root 11  0  0  0  0 ? I Jun01 0:00 [rcu_bh] [rcu_bh]  60000 0 + 12 2022-06-02 00:02:01.000 info   9 root <NULL>  12  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [migration/0]  [migration/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   10 root <NULL>  14  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [cpuhp/0]  [cpuhp/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info 0 root 1  0  0  158392  7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 + 30 2022-06-02 00:03:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 + 30 2022-06-02 00:03:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 + 30 2022-06-02 00:03:01.000 info 5 root 8  0  0  0  0 ? I< Jun01 0:00 [mm_percpu_wq] [mm_percpu_wq]  60000 0 + 30 2022-06-02 00:03:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out b/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out index 826c8ed6..263723f4 100644 --- a/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out +++ b/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out @@ -1,4 +1,4 @@ -log_line  log_time log_level  comp  opid  tid  user  file  item  line prc reason  req  sid  src  sub vpxa_update match_index  lro_id  entity  operation  SessionId  SessionSubId log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_body  +log_line  log_time  log_level  comp   opid   tid   user   file   item   line  prc  reason  req   sid   src   sub  vpxa_update match_index  lro_id   entity   operation   SessionId   SessionSubId  log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_body   0 2022-06-02 11:58:12.193 info 7e1280cf 45715 vpxd Originator@6876 vpxLro 0 lro-846063 SessionManager vim.SessionManager.sessionIsActive 528e6e0c-246d-58b5-3234-278c6e0c5d0d 52c289ac-2563-48d5-8a8e-f178da022c0d  0 0 [VpxLRO] -- BEGIN lro-846063 -- SessionManager -- vim.Sessio⋯8b5-3234-278c6e0c5d0d(52c289ac-2563-48d5-8a8e-f178da022c0d) 2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866   182 0 [VpxLRO] -- BEGIN lro-846064 -- SessionManager -- vim.Sessio⋯287-b4e4-344192c6a01d(523e0a4b-6e83-6bcd-9342-22502dd89866)  4 2022-06-02 11:58:12.623 info  <NULL> l3wrhr4o-cbf-h5:70001034-60 47524 <NULL> <NULL> <NULL> <NULL> vpxd <NULL> <NULL> <NULL> Originator@6876 vpxLro  <NULL>  0 lro-846066 ChangeLogCollector vim.cdc.ChangeLogCollector.waitForChanges 526861fc-0c28-1930-ae5e-d8c2772bf8c2 52a7a308-9646-c054-f1e7-16131c1a7db6  <NULL>  246  0  <NULL>  <NULL>  <NULL>  <NULL> [VpxLRO] -- BEGIN lro-846066 -- ChangeLogCollector -- vim.c⋯1930-ae5e-d8c2772bf8c2(52a7a308-9646-c054-f1e7-16131c1a7db6)  diff --git a/test/expected/test_sql_str_func.sh_0db1c1b406ba6ef2dadcbe90a3fdbe794a664eb5.out b/test/expected/test_sql_str_func.sh_0db1c1b406ba6ef2dadcbe90a3fdbe794a664eb5.out index d4d6d5c7..bda66916 100644 --- a/test/expected/test_sql_str_func.sh_0db1c1b406ba6ef2dadcbe90a3fdbe794a664eb5.out +++ b/test/expected/test_sql_str_func.sh_0db1c1b406ba6ef2dadcbe90a3fdbe794a664eb5.out @@ -1,2 +1,2 @@ -humanize_id('foo') humanize_id('bar')  +humanize_id('foo') humanize_id('bar')  foo bar diff --git a/test/expected/test_sql_str_func.sh_11d458fdadd00df1239a0eeaac049abb49ed212d.out b/test/expected/test_sql_str_func.sh_11d458fdadd00df1239a0eeaac049abb49ed212d.out index 015e50b5..7d625dd8 100644 --- a/test/expected/test_sql_str_func.sh_11d458fdadd00df1239a0eeaac049abb49ed212d.out +++ b/test/expected/test_sql_str_func.sh_11d458fdadd00df1239a0eeaac049abb49ed212d.out @@ -1,4 +1,4 @@ -anonymize(bro_id_resp_h)  +anonymize(bro_id_resp_h)  10.0.0.1 10.0.0.2 10.0.0.2  diff --git a/test/expected/test_sql_str_func.sh_949ffd5b2ef9fbcbe17f2e61ef7750f7038f6fd6.out b/test/expected/test_sql_str_func.sh_949ffd5b2ef9fbcbe17f2e61ef7750f7038f6fd6.out index a4419467..90daa310 100644 --- a/test/expected/test_sql_str_func.sh_949ffd5b2ef9fbcbe17f2e61ef7750f7038f6fd6.out +++ b/test/expected/test_sql_str_func.sh_949ffd5b2ef9fbcbe17f2e61ef7750f7038f6fd6.out @@ -1,2 +1,2 @@ -regexp_match('^(\w+)=([^;]+);', 'abc=def;ghi=jkl;')  +regexp_match('^(\w+)=([^;]+);', 'abc=def;ghi=jkl;')  {"col_0":"abc","col_1":"def"} diff --git a/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out b/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out index 36c95379..a988f1b1 100644 --- a/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out +++ b/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out @@ -1,3 +1,3 @@ -view_name filter_id enabled type language pattern  +view_name filter_id enabled type language pattern  log 1 1 in regex vmk log 2 1 in regex vmk1 diff --git a/test/expected/test_sql_views_vtab.sh_6ffd89498b9a7758ded6717148fc2ce77a12621b.out b/test/expected/test_sql_views_vtab.sh_6ffd89498b9a7758ded6717148fc2ce77a12621b.out index 1ad5fbf9..ac0d98cb 100644 --- a/test/expected/test_sql_views_vtab.sh_6ffd89498b9a7758ded6717148fc2ce77a12621b.out +++ b/test/expected/test_sql_views_vtab.sh_6ffd89498b9a7758ded6717148fc2ce77a12621b.out @@ -1,2 +1,2 @@ -search  +search  warn diff --git a/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out b/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out index 79b31c39..25e56454 100644 --- a/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out +++ b/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out @@ -1,2 +1,2 @@ -view_name filter_id enabled type language pattern  +view_name filter_id enabled type language pattern  log 0 1 out sql 1 diff --git a/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out b/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out index dae64c0c..4041522a 100644 --- a/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out +++ b/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out @@ -1,2 +1,2 @@ -view_name filter_id enabled type language pattern  +view_name filter_id enabled type language pattern  log 1 1 in regex vmk diff --git a/test/expected/test_text_file.sh_11fd274911e45a743b4de616888a64183d07cb76.out b/test/expected/test_text_file.sh_11fd274911e45a743b4de616888a64183d07cb76.out index 77618337..4ef8aa77 100644 --- a/test/expected/test_text_file.sh_11fd274911e45a743b4de616888a64183d07cb76.out +++ b/test/expected/test_text_file.sh_11fd274911e45a743b4de616888a64183d07cb76.out @@ -1,2 +1,2 @@ -content  +content  abc diff --git a/test/expected/test_text_file.sh_8b2cd055e6a1db2ed9b2af2a917f8556395fa653.out b/test/expected/test_text_file.sh_8b2cd055e6a1db2ed9b2af2a917f8556395fa653.out index 0ef4c309..0290454a 100644 --- a/test/expected/test_text_file.sh_8b2cd055e6a1db2ed9b2af2a917f8556395fa653.out +++ b/test/expected/test_text_file.sh_8b2cd055e6a1db2ed9b2af2a917f8556395fa653.out @@ -1,2 +1,2 @@ - filepath  descriptor  mimetype  content  + filepath   descriptor   mimetype   content   {test_dir}/textfile_0.md net.daringfireball.markdown.frontmatter application/json {␊ "comment": "This is JSON front-matter"␊}