Merge pull request #17 from maklff/sqlstate

Add sqlstate to the ouptput of pg_log_errors_stats()
munakoiso · Jan 31, 2023 · 9ea8b01 · 9ea8b01
2 parents 99bf4a9 + 9ffe0d7
commit 9ea8b01
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/logerrors--2.0--2.1.sql b/logerrors--2.0--2.1.sql
@@ -0,0 +1,15 @@
+ALTER EXTENSION logerrors DROP FUNCTION pg_log_errors_stats();
+DROP FUNCTION IF EXISTS pg_log_errors_stats();
+
+CREATE FUNCTION pg_log_errors_stats(
+    OUT time_interval integer,
+    OUT type text,
+    OUT message text,
+    OUT count integer,
+    OUT username text,
+    OUT database text,
+    OUT sqlstate text
+)
+    RETURNS SETOF record
+AS 'MODULE_PATHNAME', 'pg_log_errors_stats'
+    LANGUAGE C STRICT;
diff --git a/logerrors.c b/logerrors.c
@@ -504,7 +504,7 @@ put_values_to_tuple(
         HTAB* counters_hashtable,
         TupleDesc tupdesc,
         Tuplestorestate *tupstore){
-#define logerrors_COLS	6
+#define logerrors_COLS	7
     Datum long_interval_values[logerrors_COLS];
     bool long_interval_nulls[logerrors_COLS];
     bool found;
@@ -574,6 +574,14 @@ put_values_to_tuple(
             else
                 long_interval_values[5] = CStringGetTextDatum(db_name);
 
+            /* SQLState */
+            if (found) {
+                long_interval_values[6] = CStringGetTextDatum(unpack_sql_state(err_code.num));
+            }
+            else {
+                long_interval_values[6] = true;
+            }
+
             if (elem->counter > 0) {
                 tuplestore_putvalues(tupstore, tupdesc, long_interval_values, long_interval_nulls);
             }
@@ -587,7 +595,7 @@ put_values_to_tuple(
 Datum
 pg_log_errors_stats(PG_FUNCTION_ARGS)
 {
-#define logerrors_COLS	6
+#define logerrors_COLS	7
     ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
     TupleDesc	tupdesc;
     Tuplestorestate *tupstore;
@@ -663,6 +671,8 @@ pg_log_errors_stats(PG_FUNCTION_ARGS)
         long_interval_nulls[4] = true;
         /* Database name */
         long_interval_nulls[5] = true;
+        /* sqlstate */
+        long_interval_nulls[6] = true;
         tuplestore_putvalues(tupstore, tupdesc, long_interval_values, long_interval_nulls);
     }
     /* short interval counters */

diff --git a/logerrors.control b/logerrors.control
@@ -1,5 +1,5 @@
 # logerrors extension
 comment = 'Function for collecting statistics about messages in logfile'
-default_version = '2.0'
+default_version = '2.1'
 module_pathname = '$libdir/logerrors'
 relocatable = true