[prql] bump prqlc version and fix the annotator

Author: tstack

src/internals/sql-ref.rst

@@ -5206,6 +5206,16 @@ stats.hist *col* *\[slice:'1h'\]* *\[top:10\]*
           tslice             v        
       2017-02⋯.000000 {"gw":3,"hw":1} 
 
+    To chart the values of ex_procname for every second:
+
+    .. code-block::  custsqlite
+
+      ;from lnav_example_log | stats.hist ex_procname slice:'1s'
+          tslice             v        
+      2017-02⋯.000000 {"gw":1,"hw":1} 
+      2017-02⋯.000000 {"gw":1}        
+      2017-02⋯.000000 {"gw":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_count_by`, :ref:`stats_sum_of`, :ref:`utils_distinct`
 

src/sql_commands.cc

@@ -961,6 +961,11 @@ static readline_context::command_t sql_commands[] = {
                 "To chart the values of ex_procname over time",
                 "from lnav_example_log | stats.hist ex_procname",
                 help_example::language::prql,
+            })
+            .with_example({
+                "To chart the values of ex_procname for every second",
+                "from lnav_example_log | stats.hist ex_procname slice:'1s'",
+                help_example::language::prql,
             }),
         nullptr,
         "prql-source",

src/sql_util.cc

@@ -2137,7 +2137,11 @@ annotate_prql_statement(attr_line_t& al)
                 saw_id_dot = true;
             } else {
                 fqids.emplace_back(id_start.value());
-                id_start = std::nullopt;
+                if (attr.sa_type == &PRQL_IDENTIFIER_ATTR) {
+                    id_start = attr.sa_range;
+                } else {
+                    id_start = std::nullopt;
+                }
                 saw_id_dot = false;
             }
         } else {

src/third-party/lnav-rs-ext/Cargo.lock

@@ -23,7 +23,7 @@ doc = false
 # Build latest: 
 # prqlc = { git = "https://github.com/PRQL/prql.git" }
 # Build deterministic:
-prqlc = "0.13.6"
+prqlc = "0.13.10"
 cxx = "1.0"
 log = "0.4"
 miette = "7.6.0"

src/third-party/lnav-rs-ext/Cargo.toml

@@ -506,6 +506,8 @@ dist_noinst_DATA = \
     test_logfile.sh_341e491abcf8772422bafb8b0eaea6492da230f6.out \
     test_logfile.sh_3fc6bfd8a6160817211f3e14fde957af75b9dbe7.err \
     test_logfile.sh_3fc6bfd8a6160817211f3e14fde957af75b9dbe7.out \
+    test_logfile.sh_438ab9544c6e77fdab0726762ae5eabe93b47e3b.err \
+    test_logfile.sh_438ab9544c6e77fdab0726762ae5eabe93b47e3b.out \
     test_logfile.sh_4a2a907fcb069b8d6e65961a7b2e796d6c3a87b1.err \
     test_logfile.sh_4a2a907fcb069b8d6e65961a7b2e796d6c3a87b1.out \
     test_logfile.sh_4c4c80c159b6cd067a83eaefd07ba737e65af3e8.err \
@@ -816,6 +818,8 @@ dist_noinst_DATA = \
     test_sql_anno.sh_1b29488b949c294479aa6054f80a35bc106b454b.out \
     test_sql_anno.sh_207c588824271813ea54748da84ee385159d385e.err \
     test_sql_anno.sh_207c588824271813ea54748da84ee385159d385e.out \
+    test_sql_anno.sh_20e47873b0d64f8a15eec3c3cc3411c37b39dcfc.err \
+    test_sql_anno.sh_20e47873b0d64f8a15eec3c3cc3411c37b39dcfc.out \
     test_sql_anno.sh_2484b6f741d7e3638e64582cbafbcbf7e970ddd8.err \
     test_sql_anno.sh_2484b6f741d7e3638e64582cbafbcbf7e970ddd8.out \
     test_sql_anno.sh_331a152080d2e278b7cc0a37728eca1ded36ed72.err \

test/expected/Makefile.am

@@ -599,7 +599,7 @@ current and previous stages of the pipeline.
 Using the top ten URLs query from earlier as an example, the PRQL
 version would be as follows:
 
- ▌;from access_log | stats.count_by cs_uri_stem | take 10    
+ ▌;from access_log | stats.count_by cs_uri_stem | take 10    
 
 The first stage selects the data source, the web  access_log  table in
 this case.  The  stats.count_by  transform is a convenience provided

test/expected/test_cmds.sh_b6a3bb78e9d60e5e1f5ce5b18e40d2f1662707ab.out

@@ -1,5 +1,5 @@
-2019-11-19 21:55:41.251929 controller → host HCI_EVT 14 Rcvd Sniff Subrating
-2019-11-19 21:56:08.685812 controller → host HCI_EVT 9 Rcvd Mode Change
-2019-11-19 21:56:08.768083 controller → host HCI_EVT 9 Rcvd Mode Change
-2019-11-19 21:56:09.376379 controller → host HCI_EVT 14 Rcvd Sniff Subrating
-2019-11-19 22:07:30.886955 controller → host HCI_EVT 6 Rcvd Encryption Key Refresh Complete
+2019-11-19 21:55:41.251929                                    controller → host                                          HCI_EVT  14 Rcvd Sniff Subrating
+2019-11-19 21:56:08.685812                                    controller → host                                          HCI_EVT   9 Rcvd Mode Change
+2019-11-19 21:56:08.768083                                    controller → host                                          HCI_EVT   9 Rcvd Mode Change
+2019-11-19 21:56:09.376379                                    controller → host                                          HCI_EVT  14 Rcvd Sniff Subrating
+2019-11-19 22:07:30.886955                                    controller → host                                          HCI_EVT   6 Rcvd Encryption Key Refresh Complete

test/expected/test_logfile.sh_438ab9544c6e77fdab0726762ae5eabe93b47e3b.out

@@ -0,0 +1,18 @@
+                 from access_log | stats.count_by `foo/bar` | take 10
+      prql_stage ----------------
+  prql_transform ----
+       prql_fqid      ----------
+      prql_stage                 ---------------------------
+       prql_pipe                 -
+       prql_fqid                   --------------
+       prql_fqid                                  ---------
+      prql_stage                                            ---------
+       prql_pipe                                            -
+  prql_transform                                              ----
+     prql_number                                                   --
+Formatted:
+from access_log
+stats.count_by `foo/bar`
+take 10
+
+Cursor offset: 49