[sql] recognize postgres keywords

tstack · tstack · commit 382b6b50e25e · 2025-08-17T06:13:36.000-07:00
diff --git a/.github/workflows/bins.yml b/.github/workflows/bins.yml
@@ -308,6 +308,7 @@ jobs:
             NEWS.md
           if-no-files-found: error
       - name: sign
+        if: ${{ inputs.upload_url != '' }}
         uses: signpath/github-action-submit-signing-request@v1.1
         env:
           # select release-signing policy for main and release branches
@@ -325,12 +326,14 @@ jobs:
           output-artifact-directory: 'lnav-signed'
       - name: upload-signed-artifact
         id: upload-signed-artifact
+        if: ${{ inputs.upload_url != '' }}
         uses: actions/upload-artifact@v4
         with:
           name: lnav-signed-windows-${{ matrix.arch }}.zip
           path: "lnav-signed"
           if-no-files-found: error
       - name: "Produce zip"
+        if: ${{ inputs.upload_url != '' }}
         run: |
           set -x
           cp lnav-signed/bin/* ../lnav-build/${{ env.LNAV_BASENAME }}/bin/
diff --git a/src/cmd.parser.cc b/src/cmd.parser.cc
@@ -102,7 +102,7 @@ parsed::arg_at(int x) const
                         auto al = attr_line_t(se.se_value);
                         auto al_x = x - se.se_origin.sf_begin;
 
-                        annotate_sql_statement(al);
+                        annotate_sql_statement(al, lnav::sql::dialect::sqlite);
                         for (const auto& attr : al.al_attrs) {
                             if (al_x < attr.sa_range.lr_start
                                 || attr.sa_range.lr_end < al_x)
diff --git a/src/column_namer.cc b/src/column_namer.cc
@@ -56,8 +56,9 @@ column_namer::existing_name(const string_fragment& in_name) const
         case language::SQL: {
             auto upped = toupper(in_name.to_string());
 
-            if (std::binary_search(
-                    std::begin(sql_keywords), std::end(sql_keywords), upped))
+            if (std::binary_search(std::begin(sqlite_keywords),
+                                   std::end(sqlite_keywords),
+                                   upped))
             {
                 return true;
             }
diff --git a/src/command_executor.cc b/src/command_executor.cc
@@ -306,7 +306,7 @@ execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)
             }
 
             auto stmt_al = attr_line_t(stmt_str);
-            readline_sqlite_highlighter(stmt_al, 0);
+            readline_sql_highlighter(stmt_al, lnav::sql::dialect::prql, 0);
             auto um
                 = lnav::console::user_message::error(
                       attr_line_t("unable to compile PRQL: ").append(stmt_al))
diff --git a/src/field_overlay_source.cc b/src/field_overlay_source.cc
@@ -400,7 +400,8 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
             this->fos_row_to_field_meta.emplace(
                 this->fos_lines.size(), row_info{std::nullopt, value_str});
         }
-        readline_sqlite_highlighter_int(al, std::nullopt, hl_range);
+        readline_sql_highlighter_int(
+            al, lnav::sql::dialect::sqlite, std::nullopt, hl_range);
 
         al.append(" = ").append(scrub_ws(value_str.c_str()));
 
@@ -436,7 +437,8 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
                             .append(qname.in())
                             .append(")")
                             .move();
-        readline_sqlite_highlighter(key_line, std::nullopt);
+        readline_sql_highlighter(
+            key_line, lnav::sql::dialect::sqlite, std::nullopt);
         auto key_size = key_line.length();
         key_line.append(" = ").append(scrub_ws(extra_pair.second));
         this->fos_row_to_field_meta.emplace(this->fos_lines.size(),
@@ -456,7 +458,8 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
                                 .append(this->fos_log_helper.format_json_getter(
                                     jpairs_map.first, lpc))
                                 .move();
-            readline_sqlite_highlighter(key_line, std::nullopt);
+            readline_sql_highlighter(
+                key_line, lnav::sql::dialect::sqlite, std::nullopt);
             auto key_size = key_line.length();
             key_line.append(" = ").append(scrub_ws(jpairs[lpc].wt_value));
             this->fos_row_to_field_meta.emplace(
@@ -479,7 +482,8 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
             this->fos_log_helper.ldh_file->get_format()->get_name().c_str(),
             qname.in());
         auto key_line = attr_line_t("   ").append(xp_call.in()).move();
-        readline_sqlite_highlighter(key_line, std::nullopt);
+        readline_sql_highlighter(
+            key_line, lnav::sql::dialect::sqlite, std::nullopt);
         auto key_size = key_line.length();
         key_line.append(" = ").append(scrub_ws(xml_pair.second));
         this->fos_row_to_field_meta.emplace(
diff --git a/src/filter_sub_source.cc b/src/filter_sub_source.cc
@@ -373,7 +373,8 @@ filter_sub_source::text_value_for_line(textview_curses& tc,
             readline_regex_highlighter(content, std::nullopt);
             break;
         case filter_lang_t::SQL:
-            readline_sqlite_highlighter(content, std::nullopt);
+            readline_sql_highlighter(
+                content, lnav::sql::dialect::sqlite, std::nullopt);
             break;
         case filter_lang_t::NONE:
             break;
diff --git a/src/help_text_formatter.cc b/src/help_text_formatter.cc
@@ -644,7 +644,8 @@ format_example_text_for_term(const help_text& ht,
             case help_context_t::HC_SQL_TABLE_VALUED_FUNCTION:
             case help_context_t::HC_PRQL_TRANSFORM:
             case help_context_t::HC_PRQL_FUNCTION:
-                readline_sqlite_highlighter(ex_line, std::nullopt);
+                readline_sql_highlighter(
+                    ex_line, lnav::sql::dialect::sqlite, std::nullopt);
                 prompt = ";";
                 break;
             default:
diff --git a/src/lnav.prompt.cc b/src/lnav.prompt.cc
@@ -437,7 +437,7 @@ prompt::rl_reformat(textinput_curses& tc)
     switch (tc.tc_prefix.al_string.front()) {
         case ';': {
             auto content = attr_line_t(tc.get_content());
-            annotate_sql_statement(content);
+            annotate_sql_statement(content, lnav::sql::dialect::sqlite);
             auto format_res = lnav::db::format(content, tc.get_cursor_offset());
             tc.set_content(format_res.fr_content);
             if (tc.tc_height == 1) {
@@ -493,7 +493,8 @@ prompt::rl_history(textinput_curses& tc)
                 al.al_attrs.emplace_back(line_range{0, 1}, VC_ICON.value(icon));
                 break;
             case ';':
-                readline_sqlite_highlighter(al, std::nullopt);
+                readline_sql_highlighter(
+                    al, lnav::sql::dialect::sqlite, std::nullopt);
                 al.insert(0, "  ");
                 al.al_attrs.emplace_back(line_range{0, 1}, VC_ICON.value(icon));
                 break;
@@ -1015,7 +1016,9 @@ prompt::get_cmd_parameter_completion(textview_curses& tc,
                     if (parent.empty()) {
                         parent = ".";
                     }
-                    if (!parent.has_root_name() || !parent.root_directory().empty()) {
+                    if (!parent.has_root_name()
+                        || !parent.root_directory().empty())
+                    {
                         log_trace("completing directory: %s", parent.c_str());
                         for (const auto& entry :
                              std::filesystem::directory_iterator(parent, ec))
@@ -1025,14 +1028,16 @@ prompt::get_cmd_parameter_completion(textview_curses& tc,
                             if (entry.is_directory()) {
                                 path_str.push_back('/');
                             } else if (ht->ht_format
-                                       == help_parameter_format_t::HPF_DIRECTORY)
+                                       == help_parameter_format_t::
+                                           HPF_DIRECTORY)
                             {
                                 continue;
                             }
                             path_str = str_as_path.to_native(path_str);
                             poss_paths.emplace(std::move(path_str));
                         }
-                        if (ht->ht_format == help_parameter_format_t::HPF_DIRECTORY
+                        if (ht->ht_format
+                                == help_parameter_format_t::HPF_DIRECTORY
                             && !ec)
                         {
                             auto path_str = parent.string();
diff --git a/src/lnav_commands.cc b/src/lnav_commands.cc
@@ -1072,7 +1072,8 @@ com_mark_expr(exec_context& ec,
             = attr_line_t(expr)
                   .with_attr_for_all(VC_ROLE.value(role_t::VCR_QUOTED_CODE))
                   .move();
-        readline_sqlite_highlighter(expr_al, std::nullopt);
+        readline_sql_highlighter(
+            expr_al, lnav::sql::dialect::sqlite, std::nullopt);
         auto um = lnav::console::user_message::error(
                       attr_line_t("invalid mark expression: ").append(expr_al))
                       .with_reason(errmsg)
@@ -1374,7 +1375,8 @@ com_filter_expr(exec_context& ec,
                 = attr_line_t(expr)
                       .with_attr_for_all(VC_ROLE.value(role_t::VCR_QUOTED_CODE))
                       .move();
-            readline_sqlite_highlighter(expr_al, std::nullopt);
+            readline_sql_highlighter(
+                expr_al, lnav::sql::dialect::sqlite, std::nullopt);
             auto um = lnav::console::user_message::error(
                           attr_line_t("invalid filter expression: ")
                               .append(expr_al))
diff --git a/src/log.annotate.cc b/src/log.annotate.cc
@@ -93,7 +93,8 @@ struct expressions : public lnav_config_listener {
                                   .with_attr_for_all(
                                       VC_ROLE.value(role_t::VCR_QUOTED_CODE))
                                   .move();
-                readline_sqlite_highlighter(sql_al, std::nullopt);
+                readline_sql_highlighter(
+                    sql_al, lnav::sql::dialect::sqlite, std::nullopt);
                 intern_string_t cond_expr_path = intern_string::lookup(
                     fmt::format(FMT_STRING("/log/annotations/{}/condition"),
                                 pair.first));
diff --git a/src/log.watch.cc b/src/log.watch.cc
@@ -81,7 +81,8 @@ struct expressions : public lnav_config_listener {
                                   .with_attr_for_all(
                                       VC_ROLE.value(role_t::VCR_QUOTED_CODE))
                                   .move();
-                readline_sqlite_highlighter(sql_al, std::nullopt);
+                readline_sql_highlighter(
+                    sql_al, lnav::sql::dialect::sqlite, std::nullopt);
                 intern_string_t watch_expr_path = intern_string::lookup(
                     fmt::format(FMT_STRING("/log/watch-expressions/{}/expr"),
                                 pair.first));
diff --git a/src/log_format.cc b/src/log_format.cc
@@ -3706,7 +3706,8 @@ external_log_format::build(std::vector<lnav::console::user_message>& errors)
                                   .with_attr_for_all(
                                       VC_ROLE.value(role_t::VCR_QUOTED_CODE))
                                   .move();
-                readline_sqlite_highlighter(sql_al, std::nullopt);
+                readline_sql_highlighter(
+                    sql_al, lnav::sql::dialect::sqlite, std::nullopt);
                 intern_string_t watch_expr_path = intern_string::lookup(
                     fmt::format(FMT_STRING("/{}/converter/header/expr/{}"),
                                 this->elf_name,
@@ -4323,8 +4324,7 @@ class external_log_table : public log_format_vtab_impl {
                         return false;
                     }
                     this->elt_container_body.ltrim(line.get_data());
-                    mod_name_range
-                        = find_string_attr_range(sa, &L_MODULE);
+                    mod_name_range = find_string_attr_range(sa, &L_MODULE);
                     if (!mod_name_range.is_valid()) {
                         return false;
                     }
diff --git a/src/md2attr_line.cc b/src/md2attr_line.cc
@@ -32,6 +32,7 @@
 #include "md2attr_line.hh"
 
 #include "base/attr_line.builder.hh"
+#include "base/from_trait.hh"
 #include "base/fs_util.hh"
 #include "base/intern_string.hh"
 #include "base/itertools.enumerate.hh"
@@ -300,8 +301,10 @@ md2attr_line::leave_block(const md4cpp::event_handler::block& bl)
                 mda.final();
             }
             tf_opt = std::make_optional(text_format_t::TF_LNAV_SCRIPT);
-        } else if (lang_sf.is_one_of("sql", "sqlite", "prql")) {
-            readline_sqlite_highlighter(block_text, block_text.length());
+        } else if (lang_sf.is_one_of("sql", "sqlite", "prql", "plpgsql")) {
+            auto from_res = from<lnav::sql::dialect>(lang_sf);
+            auto dia = from_res.unwrap();
+            readline_sql_highlighter(block_text, dia, block_text.length());
             tf_opt = std::make_optional(text_format_t::TF_SQL);
         } else if (lang_sf.is_one_of("shell", "bash")) {
             readline_shlex_highlighter(block_text, block_text.length());
diff --git a/src/readline_callbacks.cc b/src/readline_callbacks.cc
@@ -172,7 +172,8 @@ format_sql_example(const char* sql_example_fmt)
         const auto* format_name = lf->get_format()->get_name().get();
 
         retval.with_ansi_string(sql_example_fmt, format_name, format_name);
-        readline_sqlite_highlighter(retval, std::nullopt);
+        readline_sql_highlighter(
+            retval, lnav::sql::dialect::sqlite, std::nullopt);
     }
     return retval;
 }
@@ -214,7 +215,7 @@ rl_sql_help(textinput_curses& rc)
         x -= 1;
     }
 
-    annotate_sql_statement(al);
+    annotate_sql_statement(al, lnav::sql::dialect::sqlite);
 
     auto avail_help = find_sql_help_for_line(al, x);
     auto lang = help_example::language::undefined;
@@ -688,7 +689,7 @@ rl_sql_change(textinput_curses& rc, bool is_req)
         clear_preview();
 
         auto anno_line = rc.tc_lines[rc.tc_cursor.y];
-        annotate_sql_statement(anno_line);
+        annotate_sql_statement(anno_line, lnav::sql::dialect::sqlite);
         auto cursor_offset = anno_line.column_to_byte_index(rc.tc_cursor.x);
 
         auto attr_iter = rfind_string_attr_if(
@@ -1099,7 +1100,7 @@ rl_search_internal(textinput_curses& rc, ln_mode_t mode, bool complete = false)
 
                 auto orig_prql_stmt = attr_line_t(term_val);
                 orig_prql_stmt.rtrim("| \r\n\t");
-                annotate_sql_statement(orig_prql_stmt);
+                lnav::sql::annotate_prql_statement(orig_prql_stmt);
 
                 auto cursor_x = rc.get_cursor_offset();
                 if (cursor_x >= orig_prql_stmt.get_string().length()) {
diff --git a/src/readline_highlighters.cc b/src/readline_highlighters.cc
@@ -203,8 +203,11 @@ readline_command_highlighter_int(attr_line_t& al,
                 al, x, line_range{(int) ws_index, sub.lr_end});
         }
         if (SQL_PREFIXES.find_in(in_frag).ignore_error()) {
-            readline_sqlite_highlighter_int(
-                al, x, line_range{(int) ws_index, sub.lr_end});
+            readline_sql_highlighter_int(
+                al,
+                lnav::sql::dialect::sqlite,
+                x,
+                line_range{(int) ws_index, sub.lr_end});
         }
     }
     if (COLOR_PREFIXES.find_in(in_frag).ignore_error()) {
@@ -274,9 +277,10 @@ readline_command_highlighter(attr_line_t& al, std::optional<int> x)
 }
 
 void
-readline_sqlite_highlighter_int(attr_line_t& al,
-                                std::optional<int> x,
-                                line_range sub)
+readline_sql_highlighter_int(attr_line_t& al,
+                             lnav::sql::dialect dia,
+                             std::optional<int> x,
+                             line_range sub)
 {
     static const char* brackets[] = {
         "[]",
@@ -289,7 +293,7 @@ readline_sqlite_highlighter_int(attr_line_t& al,
 
     auto anno_sql = al.subline(sub.lr_start, sub.length());
     anno_sql.get_attrs().clear();
-    annotate_sql_statement(anno_sql);
+    annotate_sql_statement(anno_sql, dia);
 
     for (const auto& attr : anno_sql.al_attrs) {
         auto lr = line_range{
@@ -357,10 +361,12 @@ readline_sqlite_highlighter_int(attr_line_t& al,
 }
 
 void
-readline_sqlite_highlighter(attr_line_t& al, std::optional<int> x)
+readline_sql_highlighter(attr_line_t& al,
+                         lnav::sql::dialect dia,
+                         std::optional<int> x)
 {
-    readline_sqlite_highlighter_int(
-        al, x, line_range{0, (int) al.get_string().length()});
+    readline_sql_highlighter_int(
+        al, dia, x, line_range{0, (int) al.get_string().length()});
 }
 
 void
@@ -468,12 +474,13 @@ readline_lnav_highlighter_int(attr_line_t& al,
             readline_command_highlighter_int(al, x, sub);
             break;
         case ';':
-            readline_sqlite_highlighter_int(al,
-                                            x,
-                                            line_range{
-                                                sub.lr_start + 1,
-                                                sub.lr_end,
-                                            });
+            readline_sql_highlighter_int(al,
+                                         lnav::sql::dialect::sqlite,
+                                         x,
+                                         line_range{
+                                             sub.lr_start + 1,
+                                             sub.lr_end,
+                                         });
             break;
         case '|':
             break;
@@ -564,7 +571,7 @@ highlight_syntax(text_format_t tf, attr_line_t& al, std::optional<int> x)
 {
     switch (tf) {
         case text_format_t::TF_SQL: {
-            readline_sqlite_highlighter(al, x);
+            readline_sql_highlighter(al, lnav::sql::dialect::sqlite, x);
             break;
         }
         case text_format_t::TF_PCRE: {
diff --git a/src/readline_highlighters.hh b/src/readline_highlighters.hh
@@ -33,16 +33,21 @@
 #define readline_highlighters_hh
 
 #include "base/attr_line.hh"
+#include "sql.formatter.hh"
+#include "sql_help.hh"
 #include "text_format.hh"
 
 void readline_regex_highlighter(attr_line_t& line, std::optional<int> x);
 
 void readline_command_highlighter(attr_line_t& line, std::optional<int> x);
 
-void readline_sqlite_highlighter_int(attr_line_t& line,
-                                     std::optional<int> x,
-                                     line_range sub);
-void readline_sqlite_highlighter(attr_line_t& line, std::optional<int> x);
+void readline_sql_highlighter_int(attr_line_t& line,
+                                  lnav::sql::dialect dia,
+                                  std::optional<int> x,
+                                  line_range sub);
+void readline_sql_highlighter(attr_line_t& line,
+                              lnav::sql::dialect dia,
+                              std::optional<int> x);
 
 void readline_shlex_highlighter_int(attr_line_t& al,
                                     std::optional<int> x,
diff --git a/src/scripts/pg-annotate-errors.lnav b/src/scripts/pg-annotate-errors.lnav
@@ -4,7 +4,7 @@
 #
 
 ;SELECT
-   '```sql' || char(10) || substr(stmt_body, 1, CASE WHEN error_line_end > 0 THEN char_offset + error_line_end ELSE length(stmt_body) END) || char(10) || '```' || char(10) ||
+   '```plpgsql' || char(10) || substr(stmt_body, 1, CASE WHEN error_line_end > 0 THEN char_offset + error_line_end ELSE length(stmt_body) END) || char(10) || '```' || char(10) ||
    '> <span style="white-space: nowrap">' || replicate(' ', CASE WHEN error_line_start > 1 THEN error_line_start - 2 ELSE char_offset - 1 END) || '<span class="-lnav_log-level-styles_error">' || replicate('^', coalesce(length(token), 1)) || '</span> ' || err_body || '</span>' || char(10) AS content
  FROM (
    SELECT
diff --git a/src/sql_help.hh b/src/sql_help.hh
diff --git a/src/sql_util.cc b/src/sql_util.cc
diff --git a/src/sql_util.hh b/src/sql_util.hh
diff --git a/test/drive_sql_anno.cc b/test/drive_sql_anno.cc
diff --git a/test/drive_textinput.cc b/test/drive_textinput.cc
diff --git a/test/expected/test_meta.sh_3b98220effee179b899aa95b277dd6629fee30ca.out b/test/expected/test_meta.sh_3b98220effee179b899aa95b277dd6629fee30ca.out
diff --git a/test/expected/test_meta.sh_517c1af536536c1010ac8ffc6b4ce2f433749de3.out b/test/expected/test_meta.sh_517c1af536536c1010ac8ffc6b4ce2f433749de3.out

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,9 @@ column_namer::existing_name(const string_fragment& in_name) const`
`56`	`56`	`case language::SQL: {`
`57`	`57`	`auto upped = toupper(in_name.to_string());`
`58`	`58`
`59`		`- if (std::binary_search(`
`60`		`- std::begin(sql_keywords), std::end(sql_keywords), upped))`
	`59`	`+ if (std::binary_search(std::begin(sqlite_keywords),`
	`60`	`+ std::end(sqlite_keywords),`
	`61`	`+ upped))`
`61`	`62`	`{`
`62`	`63`	`return true;`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`auto stmt_al = attr_line_t(stmt_str);`
`309`		`- readline_sqlite_highlighter(stmt_al, 0);`
	`309`	`+ readline_sql_highlighter(stmt_al, lnav::sql::dialect::prql, 0);`
`310`	`310`	`auto um`
`311`	`311`	`= lnav::console::user_message::error(`
`312`	`312`	`attr_line_t("unable to compile PRQL: ").append(stmt_al))`