path: root/20220208-upstream.patch

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index 0b7305f..4d0b14d 100644
--- a/README.md
+++ b/README.md
@@ -5,31 +5,32 @@
 This plugin provides syntax highlighting and auto-completion support for
 PostgreSQL version 9.6 or above and for some of its extensions, including:
 
-- PL/pgSQL;
-- [PostGIS](http://postgis.net) (including PostGIS Topology);
-- [pgRouting](http://pgrouting.org);
-- [pgTap](http://pgtap.org).
+-   PL/pgSQL;
+-   [PostGIS](http://postgis.net) (including PostGIS Topology);
+-   [pgRouting](http://pgrouting.org);
+-   [pgTap](http://pgtap.org).
 
 Besides, syntax highlighting for any language may be activated inside functions
 (see below).
 
-
 # Installation
 
 If your Vim supports packages (`echo has('packages')` prints `1`), I strongly
 recommend that you use them. Just clone this repo inside `pack/*/start`, e.g.,
 
-    mkdir -p ~/.vim/pack/plugins/start
-    git clone https://github.com/lifepillar/pgsql.vim.git ~/.vim/pack/plugins/start/pgsql
-
+```bash
+mkdir -p ~/.vim/pack/plugins/start
+git clone https://github.com/lifepillar/pgsql.vim.git ~/.vim/pack/plugins/start/pgsql
+```
 
 Otherwise, if you don't have a preferred installation method, I recommend
 installing [Pathogen](https://github.com/tpope/vim-pathogen), and then simply
 copy and paste:
 
-    cd ~/.vim/bundle
-    git clone https://github.com/lifepillar/pgsql.vim.git
-
+```bash
+cd ~/.vim/bundle
+git clone https://github.com/lifepillar/pgsql.vim.git
+```
 
 # Usage
 
@@ -39,15 +40,21 @@ Files with a `.pgsql` suffix are highlighted out of the box. If you want to
 highlight `.sql` files using this plugin by default, add this to your `.vimrc`
 (see `:h ft_sql.txt`):
 
-    let g:sql_type_default = 'pgsql'
+```vim
+let g:sql_type_default = 'pgsql'
+```
 
 Alternatively, after loading a `.sql` file use this command:
 
-    :SQLSetType pgsql.vim
+```vim
+:SQLSetType pgsql.vim
+```
 
 To set the file type in new buffers use:
 
-    :let b:sql_type_override='pgsql' | set ft=sql
+```vim
+:let b:sql_type_override='pgsql' | set ft=sql
+```
 
 Code between `$pgsql$` or `$$` pairs is treated as PL/pgSQL and highlighted
 accordingly:
@@ -57,13 +64,14 @@ accordingly:
 You may set `g:pgsql_pl` to a list of file types to be used in user-defined
 functions. For example, after setting:
 
-    let g:pgsql_pl = ['python']
+```vim
+let g:pgsql_pl = ['python']
+```
 
 code between `$python$` pairs will be highlighted as Python:
 
 ![PL/Pythonu snippet](https://raw.github.com/lifepillar/Resources/master/pgsql/plpython.png)
 
-
 # Hacking
 
 The syntax file is generated automatically. If you want to hack it, edit
@@ -85,13 +93,10 @@ browse the source scripts to see exactly what they do.
 The above command will update `syntax/pgsql.vim`. Use `make distclean` to drop
 the database (or drop it manually).
 
-The script has been tested in macOS, but it should work on other systems as
-well.
-
+The script has been tested in macOS, but it should work on any \*nix system.
 
 # Acknowledgments
 
 This plugin was originally based on code from
 [space::tekk](https://github.com/spacetekk/pgsql.vim) (and completely
 rewritten).
-
diff --git a/doc/pgsql.txt b/doc/pgsql.txt
index a634d6b..cc14762 100644
--- a/doc/pgsql.txt
+++ b/doc/pgsql.txt
@@ -79,6 +79,12 @@ Set to 1 if you want double-dollar enclosed text highlighted as a SQL string.
 By default, text quoted with `$$` is highlighted as PL/pgSQL.
 >
 	let g:pgsql_dollar_strings = 0
+<
+						*'g:pgsql_fold_functions_only'*
+Use this option if you want to fold only code of stored functions, procedures
+and "do" blocks.
+>
+	let g:pgsql_fold_functions_only = 1
 <
 						*'g:pgsql_pl'*
 						*'b:pgsql_pl'*
diff --git a/doc/tags b/doc/tags
index c76f38c..94ba265 100644
--- a/doc/tags
+++ b/doc/tags
@@ -2,6 +2,7 @@
 'g:pgsql_backslash_quote'	pgsql.txt	/*'g:pgsql_backslash_quote'*
 'g:pgsql_disabled_extensions'	pgsql.txt	/*'g:pgsql_disabled_extensions'*
 'g:pgsql_dollar_strings'	pgsql.txt	/*'g:pgsql_dollar_strings'*
+'g:pgsql_fold_functions_only'	pgsql.txt	/*'g:pgsql_fold_functions_only'*
 'g:pgsql_pl'	pgsql.txt	/*'g:pgsql_pl'*
 pgsql-autocompletion	pgsql.txt	/*pgsql-autocompletion*
 pgsql-contents	pgsql.txt	/*pgsql-contents*
diff --git a/src/common.sql b/src/common.sql
index 48111c3..d28876f 100644
--- a/src/common.sql
+++ b/src/common.sql
@@ -48,7 +48,8 @@ $$
    where name not in ( -- Extensions to skip
                        'citus',
                        'cstore_fdw',
-                       'plr' -- Not available for PostgreSQL 9.6 or later?
+                       'plr', -- Not available for PostgreSQL 9.6 or later?
+                       'temporal_tables'
                      )
      and name not in (select extname::name from public.legacy_extension_names());
 $$;
@@ -106,7 +107,9 @@ set search_path to "information_schema" as
 $$
   select distinct routine_name::text
     from routines
-   where specific_schema = 'pg_catalog';
+   where specific_schema = 'pg_catalog'
+     and routine_name::text <> 'char'    -- because we highlight char as a type
+     and routine_name::text <> 'varchar' -- ditto
 $$;
 
 
@@ -161,10 +164,10 @@ $$
   -- Serial types are not true types, but merely a notational convenience for creating unique identifier columns.
   -- See https://www.postgresql.org/docs/current/static/datatype-numeric.html#DATATYPE-SERIAL
   values ('smallserial'), ('serial'), ('bigserial'), ('serial2'), ('serial4'), ('serial8'),
-         ('array'), ('bigint'), ('bit'), ('boolean'), ('char'), ('character'), ('cube'), ('decimal'),
+         ('array'), ('bigint'), ('bit'), ('boolean'), ('character'), ('cube'), ('decimal'),
          ('double'), ('int'), ('integer'),
          ('interval'), ('numeric'), ('precision'), ('real'), ('smallint'), ('timestamp'),
-         ('varchar'), ('varying'), ('xml'), ('at'), ('zone');
+         ('varying'), ('xml'), ('at'), ('zone');
 $$;
 
 
diff --git a/src/keywords.sql b/src/keywords.sql
index 2fa9990..46ed9a2 100644
--- a/src/keywords.sql
+++ b/src/keywords.sql
@@ -57,22 +57,21 @@ work
 aclitem
 addbandarg
 addr
-addr_gid_seq
 addrfeat
-addrfeat_gid_seq
 agg_count
 agg_samealignment
 anyarray
 anycompatible
 anycompatiblearray
+anycompatiblemultirange
 anycompatiblenonarray
 anycompatiblerange
 anyelement
 anyenum
+anymultirange
 anynonarray
 anyrange
 bg
-bg_gid_seq
 bit
 bool
 box
@@ -89,28 +88,24 @@ cidr
 circle
 citext
 county
-county_gid_seq
 county_lookup
 countysub_lookup
 cousub
-cousub_gid_seq
 cstring
 cube
 date
+datemultirange
 daterange
 dblink_pkey_results
 direction_lookup
 ean13
 earth
 edges
-edges_gid_seq
 errcodes
 event_trigger
 faces
-faces_gid_seq
 fdw_handler
 featnames
-featnames_gid_seq
 float4
 float8
 gbtreekey16
@@ -137,8 +132,10 @@ inet
 int2
 int2vector
 int4
+int4multirange
 int4range
 int8
+int8multirange
 int8range
 intbig_gkey
 internal
@@ -169,17 +166,17 @@ macaddr8
 money
 norm_addy
 numeric
+nummultirange
 numrange
 oid
 oidvector
 pagc_gaz
-pagc_gaz_id_seq
 pagc_lex
-pagc_lex_id_seq
 pagc_rules
-pagc_rules_id_seq
 path
 pg_all_foreign_keys
+pg_brin_bloom_summary
+pg_brin_minmax_multi_summary
 pg_ddl_command
 pg_dependencies
 pg_lsn
@@ -187,8 +184,8 @@ pg_mcv_list
 pg_ndistinct
 pg_node_tree
 pg_snapshot
+pg_stat_statements_info
 place
-place_gid_seq
 place_lookup
 point
 polygon
@@ -217,13 +214,12 @@ spatial_ref_sys
 spheroid
 sql_identifier
 state
-state_gid_seq
 state_lookup
 stdaddr
 street_type_lookup
 summarystats
 tabblock
-tabblock_gid_seq
+tabblock20
 table_am_handler
 tablefunc_crosstab_2
 tablefunc_crosstab_3
@@ -240,23 +236,20 @@ topoelement
 topoelementarray
 topogeometry
 topology
-topology_id_seq
 tract
-tract_gid_seq
 tsm_handler
+tsmultirange
 tsquery
 tsrange
+tstzmultirange
 tstzrange
 tsvector
 txid_snapshot
 unionarg
 upc
 us_gaz
-us_gaz_id_seq
 us_lex
-us_lex_id_seq
 us_rules
-us_rules_id_seq
 uuid
 valid_detail
 validatetopology_returntype
@@ -268,7 +261,6 @@ xid8
 xml
 yes_or_no
 zcta5
-zcta5_gid_seq
 zip_lookup
 zip_lookup_all
 zip_lookup_base
@@ -281,7 +273,6 @@ bigint
 bigserial
 bit
 boolean
-char
 character
 cube
 decimal
@@ -299,7 +290,6 @@ serial8
 smallint
 smallserial
 timestamp
-varchar
 varying
 xml
 zone
@@ -344,6 +334,8 @@ anycompatiblearray_in()
 anycompatiblearray_out()
 anycompatiblearray_recv()
 anycompatiblearray_send()
+anycompatiblemultirange_in()
+anycompatiblemultirange_out()
 anycompatiblenonarray_in()
 anycompatiblenonarray_out()
 anycompatiblerange_in()
@@ -352,6 +344,8 @@ anyelement_in()
 anyelement_out()
 anyenum_in()
 anyenum_out()
+anymultirange_in()
+anymultirange_out()
 anynonarray_in()
 anynonarray_out()
 anyrange_in()
@@ -389,6 +383,7 @@ array_remove()
 array_replace()
 array_send()
 array_smaller()
+array_subscript_handler()
 array_to_json()
 array_to_string()
 array_to_tsvector()
@@ -419,20 +414,23 @@ binary_upgrade_set_missing_value()
 binary_upgrade_set_next_array_pg_type_oid()
 binary_upgrade_set_next_heap_pg_class_oid()
 binary_upgrade_set_next_index_pg_class_oid()
+binary_upgrade_set_next_multirange_array_pg_type_oid()
+binary_upgrade_set_next_multirange_pg_type_oid()
 binary_upgrade_set_next_pg_authid_oid()
 binary_upgrade_set_next_pg_enum_oid()
 binary_upgrade_set_next_pg_type_oid()
 binary_upgrade_set_next_toast_pg_class_oid()
-binary_upgrade_set_next_toast_pg_type_oid()
 binary_upgrade_set_record_init_privs()
 bit()
 bit_and()
+bit_count()
 bit_in()
 bit_length()
 bit_or()
 bit_out()
 bit_recv()
 bit_send()
+bit_xor()
 bitand()
 bitcat()
 bitcmp()
@@ -530,6 +528,15 @@ bpcharregexne()
 bpcharsend()
 bpchartypmodin()
 bpchartypmodout()
+brin_bloom_add_value()
+brin_bloom_consistent()
+brin_bloom_opcinfo()
+brin_bloom_options()
+brin_bloom_summary_in()
+brin_bloom_summary_out()
+brin_bloom_summary_recv()
+brin_bloom_summary_send()
+brin_bloom_union()
 brin_desummarize_range()
 brin_inclusion_add_value()
 brin_inclusion_consistent()
@@ -537,6 +544,32 @@ brin_inclusion_opcinfo()
 brin_inclusion_union()
 brin_minmax_add_value()
 brin_minmax_consistent()
+brin_minmax_multi_add_value()
+brin_minmax_multi_consistent()
+brin_minmax_multi_distance_date()
+brin_minmax_multi_distance_float4()
+brin_minmax_multi_distance_float8()
+brin_minmax_multi_distance_inet()
+brin_minmax_multi_distance_int2()
+brin_minmax_multi_distance_int4()
+brin_minmax_multi_distance_int8()
+brin_minmax_multi_distance_interval()
+brin_minmax_multi_distance_macaddr()
+brin_minmax_multi_distance_macaddr8()
+brin_minmax_multi_distance_numeric()
+brin_minmax_multi_distance_pg_lsn()
+brin_minmax_multi_distance_tid()
+brin_minmax_multi_distance_time()
+brin_minmax_multi_distance_timestamp()
+brin_minmax_multi_distance_timetz()
+brin_minmax_multi_distance_uuid()
+brin_minmax_multi_opcinfo()
+brin_minmax_multi_options()
+brin_minmax_multi_summary_in()
+brin_minmax_multi_summary_out()
+brin_minmax_multi_summary_recv()
+brin_minmax_multi_summary_send()
+brin_minmax_multi_union()
 brin_minmax_opcinfo()
 brin_minmax_union()
 brin_summarize_new_values()
@@ -633,7 +666,6 @@ cbrt()
 ceil()
 ceiling()
 center()
-char()
 char_length()
 character_length()
 chareq()
@@ -725,7 +757,6 @@ current_schema()
 current_schemas()
 current_setting()
 current_user()
-currtid()
 currtid2()
 currval()
 cursor_to_xml()
@@ -734,6 +765,7 @@ database_to_xml()
 database_to_xml_and_xmlschema()
 database_to_xmlschema()
 date()
+date_bin()
 date_cmp()
 date_cmp_timestamp()
 date_cmp_timestamptz()
@@ -769,6 +801,7 @@ date_send()
 date_smaller()
 date_sortsupport()
 date_trunc()
+datemultirange()
 daterange()
 daterange_canonical()
 daterange_subdiff()
@@ -819,6 +852,7 @@ dsqrt()
 dsynonym_init()
 dsynonym_lexize()
 dtrunc()
+elem_contained_by_multirange()
 elem_contained_by_range()
 encode()
 enum_cmp()
@@ -855,6 +889,7 @@ event_trigger_in()
 event_trigger_out()
 every()
 exp()
+extract()
 factorial()
 family()
 fdw_handler_in()
@@ -996,6 +1031,7 @@ gist_point_compress()
 gist_point_consistent()
 gist_point_distance()
 gist_point_fetch()
+gist_point_sortsupport()
 gist_poly_compress()
 gist_poly_consistent()
 gist_poly_distance()
@@ -1032,10 +1068,14 @@ hash_aclitem()
 hash_aclitem_extended()
 hash_array()
 hash_array_extended()
+hash_multirange()
+hash_multirange_extended()
 hash_numeric()
 hash_numeric_extended()
 hash_range()
 hash_range_extended()
+hash_record()
+hash_record_extended()
 hashbpchar()
 hashbpcharextended()
 hashchar()
@@ -1215,6 +1255,7 @@ int4lt()
 int4mi()
 int4mod()
 int4mul()
+int4multirange()
 int4ne()
 int4not()
 int4or()
@@ -1280,6 +1321,7 @@ int8lt()
 int8mi()
 int8mod()
 int8mul()
+int8multirange()
 int8ne()
 int8not()
 int8or()
@@ -1445,6 +1487,7 @@ jsonb_send()
 jsonb_set()
 jsonb_set_lax()
 jsonb_strip_nulls()
+jsonb_subscript_handler()
 jsonb_to_record()
 jsonb_to_recordset()
 jsonb_to_tsvector()
@@ -1604,6 +1647,43 @@ mode()
 mode_final()
 money()
 mul_d_interval()
+multirange()
+multirange_adjacent_multirange()
+multirange_adjacent_range()
+multirange_after_multirange()
+multirange_after_range()
+multirange_before_multirange()
+multirange_before_range()
+multirange_cmp()
+multirange_contained_by_multirange()
+multirange_contained_by_range()
+multirange_contains_elem()
+multirange_contains_multirange()
+multirange_contains_range()
+multirange_eq()
+multirange_ge()
+multirange_gist_compress()
+multirange_gist_consistent()
+multirange_gt()
+multirange_in()
+multirange_intersect()
+multirange_intersect_agg_transfn()
+multirange_le()
+multirange_lt()
+multirange_minus()
+multirange_ne()
+multirange_out()
+multirange_overlaps_multirange()
+multirange_overlaps_range()
+multirange_overleft_multirange()
+multirange_overleft_range()
+multirange_overright_multirange()
+multirange_overright_range()
+multirange_recv()
+multirange_send()
+multirange_typanalyze()
+multirange_union()
+multirangesel()
 mxid_age()
 name()
 nameconcatoid()
@@ -1681,7 +1761,6 @@ numeric_div()
 numeric_div_trunc()
 numeric_eq()
 numeric_exp()
-numeric_fac()
 numeric_ge()
 numeric_gt()
 numeric_in()
@@ -1695,6 +1774,7 @@ numeric_mod()
 numeric_mul()
 numeric_ne()
 numeric_out()
+numeric_pl_pg_lsn()
 numeric_poly_avg()
 numeric_poly_combine()
 numeric_poly_deserialize()
@@ -1722,6 +1802,7 @@ numeric_var_pop()
 numeric_var_samp()
 numerictypmodin()
 numerictypmodout()
+nummultirange()
 numnode()
 numrange()
 numrange_subdiff()
@@ -1812,6 +1893,7 @@ pg_client_encoding()
 pg_collation_actual_version()
 pg_collation_for()
 pg_collation_is_visible()
+pg_column_compression()
 pg_column_is_updatable()
 pg_column_size()
 pg_conf_load_time()
@@ -1860,12 +1942,15 @@ pg_file_unlink()
 pg_file_write()
 pg_filenode_relation()
 pg_function_is_visible()
+pg_get_backend_memory_contexts()
+pg_get_catalog_foreign_keys()
 pg_get_constraintdef()
 pg_get_expr()
 pg_get_function_arg_default()
 pg_get_function_arguments()
 pg_get_function_identity_arguments()
 pg_get_function_result()
+pg_get_function_sqlbody()
 pg_get_functiondef()
 pg_get_indexdef()
 pg_get_keywords()
@@ -1880,9 +1965,12 @@ pg_get_ruledef()
 pg_get_serial_sequence()
 pg_get_shmem_allocations()
 pg_get_statisticsobjdef()
+pg_get_statisticsobjdef_columns()
+pg_get_statisticsobjdef_expressions()
 pg_get_triggerdef()
 pg_get_userbyid()
 pg_get_viewdef()
+pg_get_wal_replay_pause_state()
 pg_has_role()
 pg_hba_file_rules()
 pg_identify_object()
@@ -1905,6 +1993,7 @@ pg_last_wal_replay_lsn()
 pg_last_xact_replay_timestamp()
 pg_listening_channels()
 pg_lock_status()
+pg_log_backend_memory_contexts()
 pg_logdir_ls()
 pg_logical_emit_message()
 pg_logical_slot_get_binary_changes()
@@ -1916,6 +2005,7 @@ pg_ls_dir()
 pg_ls_logdir()
 pg_ls_tmpdir()
 pg_ls_waldir()
+pg_lsn()
 pg_lsn_cmp()
 pg_lsn_eq()
 pg_lsn_ge()
@@ -1927,8 +2017,10 @@ pg_lsn_larger()
 pg_lsn_le()
 pg_lsn_lt()
 pg_lsn_mi()
+pg_lsn_mii()
 pg_lsn_ne()
 pg_lsn_out()
+pg_lsn_pli()
 pg_lsn_recv()
 pg_lsn_send()
 pg_lsn_smaller()
@@ -2034,6 +2126,7 @@ pg_stat_get_buf_fsync_backend()
 pg_stat_get_buf_written_backend()
 pg_stat_get_checkpoint_sync_time()
 pg_stat_get_checkpoint_write_time()
+pg_stat_get_db_active_time()
 pg_stat_get_db_blk_read_time()
 pg_stat_get_db_blk_write_time()
 pg_stat_get_db_blocks_fetched()
@@ -2047,7 +2140,13 @@ pg_stat_get_db_conflict_snapshot()
 pg_stat_get_db_conflict_startup_deadlock()
 pg_stat_get_db_conflict_tablespace()
 pg_stat_get_db_deadlocks()
+pg_stat_get_db_idle_in_transaction_time()
 pg_stat_get_db_numbackends()
+pg_stat_get_db_session_time()
+pg_stat_get_db_sessions()
+pg_stat_get_db_sessions_abandoned()
+pg_stat_get_db_sessions_fatal()
+pg_stat_get_db_sessions_killed()
 pg_stat_get_db_stat_reset_time()
 pg_stat_get_db_temp_bytes()
 pg_stat_get_db_temp_files()
@@ -2071,6 +2170,7 @@ pg_stat_get_live_tuples()
 pg_stat_get_mod_since_analyze()
 pg_stat_get_numscans()
 pg_stat_get_progress_info()
+pg_stat_get_replication_slot()
 pg_stat_get_slru()
 pg_stat_get_snapshot_timestamp()
 pg_stat_get_subscription()
@@ -2081,6 +2181,7 @@ pg_stat_get_tuples_inserted()
 pg_stat_get_tuples_returned()
 pg_stat_get_tuples_updated()
 pg_stat_get_vacuum_count()
+pg_stat_get_wal()
 pg_stat_get_wal_receiver()
 pg_stat_get_wal_senders()
 pg_stat_get_xact_blocks_fetched()
@@ -2096,6 +2197,7 @@ pg_stat_get_xact_tuples_inserted()
 pg_stat_get_xact_tuples_returned()
 pg_stat_get_xact_tuples_updated()
 pg_stat_reset()
+pg_stat_reset_replication_slot()
 pg_stat_reset_shared()
 pg_stat_reset_single_function_counters()
 pg_stat_reset_single_table_counters()
@@ -2130,6 +2232,7 @@ pg_wal_replay_resume()
 pg_walfile_name()
 pg_walfile_name_offset()
 pg_xact_commit_timestamp()
+pg_xact_commit_timestamp_origin()
 pg_xact_status()
 phraseto_tsquery()
 pi()
@@ -2211,12 +2314,20 @@ radians()
 radius()
 random()
 range_adjacent()
+range_adjacent_multirange()
 range_after()
+range_after_multirange()
+range_agg()
+range_agg_finalfn()
+range_agg_transfn()
 range_before()
+range_before_multirange()
 range_cmp()
 range_contained_by()
+range_contained_by_multirange()
 range_contains()
 range_contains_elem()
+range_contains_multirange()
 range_eq()
 range_ge()
 range_gist_consistent()
@@ -2227,6 +2338,8 @@ range_gist_union()
 range_gt()
 range_in()
 range_intersect()
+range_intersect_agg()
+range_intersect_agg_transfn()
 range_le()
 range_lt()
 range_merge()
@@ -2234,8 +2347,11 @@ range_minus()
 range_ne()
 range_out()
 range_overlaps()
+range_overlaps_multirange()
 range_overleft()
+range_overleft_multirange()
 range_overright()
+range_overright_multirange()
 range_recv()
 range_send()
 range_typanalyze()
@@ -2243,6 +2359,7 @@ range_union()
 rangesel()
 rank()
 rank_final()
+raw_array_subscript_handler()
 record_eq()
 record_ge()
 record_gt()
@@ -2410,6 +2527,7 @@ string_agg()
 string_agg_finalfn()
 string_agg_transfn()
 string_to_array()
+string_to_table()
 strip()
 strpos()
 substr()
@@ -2616,6 +2734,7 @@ transaction_timestamp()
 translate()
 trigger_in()
 trigger_out()
+trim_array()
 trim_scale()
 trunc()
 ts_debug()
@@ -2638,6 +2757,7 @@ tsm_handler_in()
 tsm_handler_out()
 tsmatchjoinsel()
 tsmatchsel()
+tsmultirange()
 tsq_mcontained()
 tsq_mcontains()
 tsquery_and()
@@ -2657,6 +2777,7 @@ tsqueryrecv()
 tsquerysend()
 tsrange()
 tsrange_subdiff()
+tstzmultirange()
 tstzrange()
 tstzrange_subdiff()
 tsvector_cmp()
@@ -2688,6 +2809,7 @@ txid_status()
 txid_visible_in_snapshot()
 uhc_to_utf8()
 unique_key_recheck()
+unistr()
 unknownin()
 unknownout()
 unknownrecv()
@@ -2744,7 +2866,6 @@ varbitlt()
 varbitne()
 varbittypmodin()
 varbittypmodout()
-varchar()
 varchar_support()
 varcharin()
 varcharout()
@@ -3456,9 +3577,6 @@ ltree_gist -- type
 ltxtquery -- type
 -- Extension: tsm_system_rows
 system_rows() -- function
--- Extension: temporal_tables
-set_system_time() -- function
-versioning() -- function
 -- Extension: jsonb_plperl
 jsonb_to_plperl() -- function
 plperl_to_jsonb() -- function
@@ -3531,6 +3649,7 @@ hstore_ne() -- function
 hstore_out() -- function
 hstore_recv() -- function
 hstore_send() -- function
+hstore_subscript_handler() -- function
 hstore_to_array() -- function
 hstore_to_json() -- function
 hstore_to_json_loose() -- function
@@ -3577,6 +3696,8 @@ cube_lt() -- function
 cube_ne() -- function
 cube_out() -- function
 cube_overlap() -- function
+cube_recv() -- function
+cube_send() -- function
 cube_size() -- function
 cube_subset() -- function
 cube_union() -- function
@@ -3666,6 +3787,7 @@ state -- table
 state_lookup -- table
 street_type_lookup -- table
 tabblock -- table
+tabblock20 -- table
 tract -- table
 zcta5 -- table
 zip_lookup -- table
@@ -4055,6 +4177,9 @@ pg_freespace() -- function
 -- Extension: file_fdw
 file_fdw_handler() -- function
 file_fdw_validator() -- function
+-- Extension: pg_surgery
+heap_force_freeze() -- function
+heap_force_kill() -- function
 -- Extension: pg_buffercache
 pg_buffercache_pages() -- function
 pg_buffercache -- view
@@ -4083,14 +4208,18 @@ dblink_send_query() -- function
 dblink_pkey_results -- type
 -- Extension: pg_stat_statements
 pg_stat_statements() -- function
+pg_stat_statements_info() -- function
 pg_stat_statements_reset() -- function
 pg_stat_statements -- view
+pg_stat_statements_info -- view
 -- Extension: insert_username
 insert_username() -- function
 -- Extension: pg_prewarm
 autoprewarm_dump_now() -- function
 autoprewarm_start_worker() -- function
 pg_prewarm() -- function
+-- Extension: old_snapshot
+pg_old_snapshot_time_mapping() -- function
 -- Extension: pgtap
 is() -- function
 add_result() -- function
@@ -4414,6 +4543,7 @@ dintdict_lexize() -- function
 -- Extension: amcheck
 bt_index_check() -- function
 bt_index_parent_check() -- function
+verify_heapam() -- function
 -- Extension: btree_gist
 cash_dist() -- function
 date_dist() -- function
@@ -4612,6 +4742,9 @@ get_raw_page() -- function
 gin_leafpage_items() -- function
 gin_metapage_info() -- function
 gin_page_opaque_info() -- function
+gist_page_items() -- function
+gist_page_items_bytea() -- function
+gist_page_opaque_info() -- function
 hash_bitmap_info() -- function
 hash_metapage_info() -- function
 hash_page_items() -- function
@@ -4656,6 +4789,7 @@ pgr_bddijkstracostmatrix() -- function
 pgr_bellmanford() -- function
 pgr_biconnectedcomponents() -- function
 pgr_binarybreadthfirstsearch() -- function
+pgr_bipartite() -- function
 pgr_boykovkolmogorov() -- function
 pgr_breadthfirstsearch() -- function
 pgr_bridges() -- function
@@ -4666,25 +4800,32 @@ pgr_contraction() -- function
 pgr_createtopology() -- function
 pgr_createverticestable() -- function
 pgr_dagshortestpath() -- function
+pgr_depthfirstsearch() -- function
 pgr_dijkstra() -- function
 pgr_dijkstracost() -- function
 pgr_dijkstracostmatrix() -- function
+pgr_dijkstranear() -- function
+pgr_dijkstranearcost() -- function
 pgr_dijkstravia() -- function
 pgr_drivingdistance() -- function
+pgr_edgecoloring() -- function
 pgr_edgedisjointpaths() -- function
 pgr_edmondskarp() -- function
 pgr_edwardmoore() -- function
 pgr_extractvertices() -- function
 pgr_floydwarshall() -- function
 pgr_full_version() -- function
+pgr_isplanar() -- function
 pgr_johnson() -- function
 pgr_kruskal() -- function
 pgr_kruskalbfs() -- function
 pgr_kruskaldd() -- function
 pgr_kruskaldfs() -- function
 pgr_ksp() -- function
+pgr_lengauertarjandominatortree() -- function
 pgr_linegraph() -- function
 pgr_linegraphfull() -- function
+pgr_makeconnected() -- function
 pgr_maxcardinalitymatch() -- function
 pgr_maxflow() -- function
 pgr_maxflowmincost() -- function
@@ -4697,6 +4838,7 @@ pgr_primbfs() -- function
 pgr_primdd() -- function
 pgr_primdfs() -- function
 pgr_pushrelabel() -- function
+pgr_sequentialvertexcoloring() -- function
 pgr_stoerwagner() -- function
 pgr_strongcomponents() -- function
 pgr_topologicalsort() -- function
@@ -4775,6 +4917,9 @@ tablefunc_crosstab_2 -- type
 tablefunc_crosstab_3 -- type
 tablefunc_crosstab_4 -- type
 -- Extension: postgres_fdw
+postgres_fdw_disconnect() -- function
+postgres_fdw_disconnect_all() -- function
+postgres_fdw_get_connections() -- function
 postgres_fdw_handler() -- function
 postgres_fdw_validator() -- function
 -- Extension: bloom
@@ -4919,11 +5064,13 @@ jsonb_plperlu
 lo
 ltree
 moddatetime
+old_snapshot
 pageinspect
 pg_buffercache
 pg_freespacemap
 pg_prewarm
 pg_stat_statements
+pg_surgery
 pg_trgm
 pg_visibility
 pgcrypto
@@ -4947,7 +5094,6 @@ seg
 sslinfo
 tablefunc
 tcn
-temporal_tables
 tsm_system_rows
 tsm_system_time
 unaccent
@@ -5007,6 +5153,7 @@ pg_auth_members
 pg_authid
 pg_available_extension_versions
 pg_available_extensions
+pg_backend_memory_contexts
 pg_cast
 pg_class
 pg_collation
@@ -5078,9 +5225,11 @@ pg_stat_gssapi
 pg_stat_progress_analyze
 pg_stat_progress_basebackup
 pg_stat_progress_cluster
+pg_stat_progress_copy
 pg_stat_progress_create_index
 pg_stat_progress_vacuum
 pg_stat_replication
+pg_stat_replication_slots
 pg_stat_slru
 pg_stat_ssl
 pg_stat_subscription
@@ -5089,6 +5238,7 @@ pg_stat_sys_tables
 pg_stat_user_functions
 pg_stat_user_indexes
 pg_stat_user_tables
+pg_stat_wal
 pg_stat_wal_receiver
 pg_stat_xact_all_tables
 pg_stat_xact_sys_tables
@@ -5108,6 +5258,7 @@ pg_statistic_ext
 pg_statistic_ext_data
 pg_stats
 pg_stats_ext
+pg_stats_ext_exprs
 pg_subscription
 pg_subscription_rel
 pg_tables
@@ -5132,7 +5283,11 @@ role_routine_grants
 role_table_grants
 role_udt_grants
 role_usage_grants
+routine_column_usage
 routine_privileges
+routine_routine_usage
+routine_sequence_usage
+routine_table_usage
 routines
 schemata
 sequences
@@ -5170,9 +5325,11 @@ and
 any
 as
 asc
+asensitive
 assertion
 assignment
 asymmetric
+atomic
 attach
 attribute
 authorization
@@ -5182,6 +5339,7 @@ before
 between
 binary
 both
+breadth
 by
 bypassrls
 cache
@@ -5205,6 +5363,7 @@ columns
 combinefunc
 comments
 committed
+compression
 concurrently
 configuration
 conflict
@@ -5241,6 +5400,7 @@ definer
 delimiter
 delimiters
 depends
+depth
 desc
 deserialfunc
 detach
@@ -5275,6 +5435,7 @@ filter
 finalfunc
 finalfunc_extra
 finalfunc_modify
+finalize
 first
 float
 following
@@ -5469,6 +5630,7 @@ restart
 restrict
 restricted
 restrictive
+return
 returning
 returns
 right
@@ -5595,7 +5757,6 @@ yes
 information_schema
 pg_catalog
 -- Operators
-!
 !!
 !~
 !~*
@@ -5797,6 +5958,7 @@ generated_always
 grouping_error
 held_cursor_requires_same_isolation_level
 idle_in_transaction_session_timeout
+idle_session_timeout
 implicit_zero_bit_padding
 in_failed_sql_transaction
 inappropriate_access_mode_for_branch_transaction
diff --git a/src/pgsql.sql b/src/pgsql.sql
index f645f89..c71dd59 100644
--- a/src/pgsql.sql
+++ b/src/pgsql.sql
@@ -183,10 +183,14 @@ endif
 
 syn case ignore
 syn sync minlines=100
-syn iskeyword @,48-57,192-255,_
+if has('patch-7.4.1142')
+  syn iskeyword @,48-57,192-255,_
+else
+  setlocal iskeyword=@,48-57,192-255,_
+endif
 
 syn match sqlIsKeyword  /\<\h\w*\>/   contains=sqlStatement,sqlKeyword,sqlCatalog,sqlConstant,sqlSpecial,sqlOption,sqlErrorCode,sqlType,sqlTable,sqlView
-syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword
+syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword,sqlType
 syn region sqlIsPsql    start=/^\s*\\/ end=/\n/ oneline contains=sqlPsqlCommand,sqlPsqlKeyword,sqlNumber,sqlString
 
 syn keyword sqlSpecial contained false null true
@@ -258,7 +262,7 @@ select vim_format_operators(array(select get_operators()), 'Operator');
 select
 $HERE$
 " Comments
-syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell
+syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell,sqlComment
 syn match  sqlComment    "#\s.*$"              contains=sqlTodo,@Spell
 syn match  sqlComment    "--.*$"               contains=sqlTodo,@Spell
 
@@ -305,6 +309,7 @@ syn keyword sqlPsqlKeyword contained unicode_border_linestyle unicode_column_lin
 syn keyword sqlPsqlKeyword contained on off auto unaligned pager
 syn keyword sqlPsqlKeyword contained AUTOCOMMIT HISTCONTROL PROMPT VERBOSITY SHOW_CONTEXT VERSION
 syn keyword sqlPsqlKeyword contained DBNAME USER HOST PORT ENCODING HISTSIZE QUIET
+syn keyword sqlPsqlKeyword contained from program pstdin pstdout stdin stdout to where with
 
 " Todo
 syn keyword sqlTodo contained TODO FIXME XXX DEBUG NOTE
@@ -333,28 +338,43 @@ syn match sqlPlpgsqlVariable ".\zs@[A-z0-9_]\+" contained
 syn match sqlPlpgsqlOperator ":=" contained
 
 syn region plpgsql matchgroup=sqlString start=+\$\z(pgsql\|body\|function\)\$+ end=+\$\z1\$+ keepend
-  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 if get(g:, 'pgsql_dollar_strings', 0)
   syn region sqlString start=+\$\$+ end=+\$\$+ contains=@Spell
 else
   syn region plpgsql matchgroup=sqlString start=+\$\$+ end=+\$\$+ keepend
-    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 endif
 
-" Folding
-syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=ALL
+let s:plgroups = 'plpgsql'
 
 " PL/<any other language>
 fun! s:add_syntax(s)
   execute 'syn include @PL' . a:s . ' syntax/' . a:s . '.vim'
   unlet b:current_syntax
-  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' . a:s
+  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' .. a:s
+  let s:plgroups .= ',pgsqlpl' . a:s
 endf
 
 for pl in get(b:, 'pgsql_pl', get(g:, 'pgsql_pl', []))
   call s:add_syntax(pl)
 endfor
 
+" Folding
+if get(g:, 'pgsql_fold_functions_only', 0)
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\%(create\s\+[a-z ]*\%(function\|procedure\)\|do\)\>/ end=/;$/ transparent fold '
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
+
+else
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>/ end=/;$/ transparent fold '
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
+
+endif
+
+unlet s:plgroups
+
 " Default highlighting
 hi def link sqlCatalog        Constant
 hi def link sqlComment        Comment
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 905cf15..0881814 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,11 +1,11 @@
 " Vim syntax file
 " Language:     SQL (PostgreSQL dialect), PL/pgSQL, PL/…, PostGIS, …
 " Maintainer:   Lifepillar
-" Version:      2.3.0
+" Version:      2.3.1
 " License:      Vim license (see `:help license`)
 
-" Based on PostgreSQL 13.1
-" Automatically generated on 2020-12-23 at 20:13:28
+" Based on PostgreSQL 14.1
+" Automatically generated on 2021-12-03 at 11:21:19
 
 if exists("b:current_syntax")
   finish
@@ -13,10 +13,14 @@ endif
 
 syn case ignore
 syn sync minlines=100
-syn iskeyword @,48-57,192-255,_
+if has('patch-7.4.1142')
+  syn iskeyword @,48-57,192-255,_
+else
+  setlocal iskeyword=@,48-57,192-255,_
+endif
 
 syn match sqlIsKeyword  /\<\h\w*\>/   contains=sqlStatement,sqlKeyword,sqlCatalog,sqlConstant,sqlSpecial,sqlOption,sqlErrorCode,sqlType,sqlTable,sqlView
-syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword
+syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword,sqlType
 syn region sqlIsPsql    start=/^\s*\\/ end=/\n/ oneline contains=sqlPsqlCommand,sqlPsqlKeyword,sqlNumber,sqlString
 
 syn keyword sqlSpecial contained false null true
@@ -30,42 +34,41 @@ syn keyword sqlStatement contained rollback savepoint security select select set
 syn keyword sqlStatement contained truncate unlisten update vacuum values work
 syn match sqlStatement contained /\<create\%(\_s\+or\_s\+replace\)\=\>/
 " Types
-syn keyword sqlType contained aclitem addbandarg addr addr_gid_seq addrfeat addrfeat_gid_seq
-syn keyword sqlType contained agg_count agg_samealignment anyarray anycompatible
-syn keyword sqlType contained anycompatiblearray anycompatiblenonarray anycompatiblerange anyelement
-syn keyword sqlType contained anyenum anynonarray anyrange bg bg_gid_seq bit bool box box2d box2df box3d
+syn keyword sqlType contained aclitem addbandarg addr addrfeat agg_count agg_samealignment
+syn keyword sqlType contained anyarray anycompatible anycompatiblearray anycompatiblemultirange
+syn keyword sqlType contained anycompatiblenonarray anycompatiblerange anyelement anyenum
+syn keyword sqlType contained anymultirange anynonarray anyrange bg bit bool box box2d box2df box3d
 syn keyword sqlType contained bpchar bytea cardinal_number char character_data cid cidr circle
-syn keyword sqlType contained citext county county_gid_seq county_lookup countysub_lookup cousub
-syn keyword sqlType contained cousub_gid_seq cstring cube date daterange dblink_pkey_results
-syn keyword sqlType contained direction_lookup ean13 earth edges edges_gid_seq errcodes
-syn keyword sqlType contained event_trigger faces faces_gid_seq fdw_handler featnames featnames_gid_seq
+syn keyword sqlType contained citext county county_lookup countysub_lookup cousub cstring cube date
+syn keyword sqlType contained datemultirange daterange dblink_pkey_results direction_lookup
+syn keyword sqlType contained ean13 earth edges errcodes event_trigger faces fdw_handler featnames
 syn keyword sqlType contained float4 float8 gbtreekey16 gbtreekey32 gbtreekey4 gbtreekey8
 syn keyword sqlType contained gbtreekey_var geocode_settings geocode_settings_default geography
 syn keyword sqlType contained geography_columns geometry geometry_columns geometry_dump geomval
 syn keyword sqlType contained getfaceedges_returntype ghstore gidx gtrgm gtsvector hstore
-syn keyword sqlType contained index_am_handler inet int2 int2vector int4 int4range int8 int8range
-syn keyword sqlType contained intbig_gkey internal interval isbn isbn13 ismn ismn13 issn issn13 json
-syn keyword sqlType contained jsonb jsonpath language_handler layer line lo loader_lookuptables
-syn keyword sqlType contained loader_platform loader_variables lquery lseg ltree ltree_gist
-syn keyword sqlType contained ltxtquery macaddr macaddr8 money norm_addy numeric numrange oid
-syn keyword sqlType contained oidvector pagc_gaz pagc_gaz_id_seq pagc_lex pagc_lex_id_seq pagc_rules
-syn keyword sqlType contained pagc_rules_id_seq path pg_all_foreign_keys pg_ddl_command
-syn keyword sqlType contained pg_dependencies pg_lsn pg_mcv_list pg_ndistinct pg_node_tree
-syn keyword sqlType contained pg_snapshot place place_gid_seq place_lookup point polygon query_int
-syn keyword sqlType contained rastbandarg raster raster_columns raster_overviews reclassarg record
-syn keyword sqlType contained refcursor regclass regcollation regconfig regdictionary
-syn keyword sqlType contained regnamespace regoper regoperator regproc regprocedure regrole regtype
+syn keyword sqlType contained index_am_handler inet int2 int2vector int4 int4multirange int4range
+syn keyword sqlType contained int8 int8multirange int8range intbig_gkey internal interval isbn
+syn keyword sqlType contained isbn13 ismn ismn13 issn issn13 json jsonb jsonpath language_handler
+syn keyword sqlType contained layer line lo loader_lookuptables loader_platform loader_variables
+syn keyword sqlType contained lquery lseg ltree ltree_gist ltxtquery macaddr macaddr8 money
+syn keyword sqlType contained norm_addy numeric nummultirange numrange oid oidvector pagc_gaz pagc_lex
+syn keyword sqlType contained pagc_rules path pg_all_foreign_keys pg_brin_bloom_summary
+syn keyword sqlType contained pg_brin_minmax_multi_summary pg_ddl_command pg_dependencies pg_lsn
+syn keyword sqlType contained pg_mcv_list pg_ndistinct pg_node_tree pg_snapshot
+syn keyword sqlType contained pg_stat_statements_info place place_lookup point polygon query_int rastbandarg
+syn keyword sqlType contained raster raster_columns raster_overviews reclassarg record refcursor
+syn keyword sqlType contained regclass regcollation regconfig regdictionary regnamespace
+syn keyword sqlType contained regoper regoperator regproc regprocedure regrole regtype
 syn keyword sqlType contained secondary_unit_lookup seg spatial_ref_sys spheroid sql_identifier state
-syn keyword sqlType contained state_gid_seq state_lookup stdaddr street_type_lookup
-syn keyword sqlType contained summarystats tabblock tabblock_gid_seq table_am_handler
-syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3 tablefunc_crosstab_4 tap_funky text
-syn keyword sqlType contained tid time time_stamp timestamp timestamptz timetz topoelement
-syn keyword sqlType contained topoelementarray topogeometry topology topology_id_seq tract
-syn keyword sqlType contained tract_gid_seq tsm_handler tsquery tsrange tstzrange tsvector txid_snapshot
-syn keyword sqlType contained unionarg upc us_gaz us_gaz_id_seq us_lex us_lex_id_seq us_rules
-syn keyword sqlType contained us_rules_id_seq uuid valid_detail validatetopology_returntype
-syn keyword sqlType contained varbit varchar void xid xid8 xml yes_or_no zcta5 zcta5_gid_seq
-syn keyword sqlType contained zip_lookup zip_lookup_all zip_lookup_base zip_state zip_state_loc
+syn keyword sqlType contained state_lookup stdaddr street_type_lookup summarystats tabblock
+syn keyword sqlType contained tabblock20 table_am_handler tablefunc_crosstab_2 tablefunc_crosstab_3
+syn keyword sqlType contained tablefunc_crosstab_4 tap_funky text tid time time_stamp timestamp
+syn keyword sqlType contained timestamptz timetz topoelement topoelementarray topogeometry
+syn keyword sqlType contained topology tract tsm_handler tsmultirange tsquery tsrange
+syn keyword sqlType contained tstzmultirange tstzrange tsvector txid_snapshot unionarg upc us_gaz us_lex
+syn keyword sqlType contained us_rules uuid valid_detail validatetopology_returntype varbit varchar
+syn keyword sqlType contained void xid xid8 xml yes_or_no zcta5 zip_lookup zip_lookup_all
+syn keyword sqlType contained zip_lookup_base zip_state zip_state_loc
 syn match sqlType /\<pg_toast_\d\+\>/
 syn match sqlType /\<time\%[stamp]\s\+with\%[out]\>/
 syn match sqlKeyword /\<with\s\+grant\>/
@@ -73,62 +76,63 @@ syn match sqlKeyword /\<on\s\+\%(tables\|sequences\|routines\)\>/
 syn match sqlType /\<text\>/
 syn match sqlKeyword /\<text\s\+search\>/
 " Additional types
-syn keyword sqlType contained array at bigint bigserial bit boolean char character cube decimal
-syn keyword sqlType contained double int integer interval numeric precision real serial serial2
-syn keyword sqlType contained serial4 serial8 smallint smallserial timestamp varchar varying xml zone
+syn keyword sqlType contained array at bigint bigserial bit boolean character cube decimal double
+syn keyword sqlType contained int integer interval numeric precision real serial serial2 serial4
+syn keyword sqlType contained serial8 smallint smallserial timestamp varying xml zone
 " Keywords
 syn keyword sqlKeyword contained absolute access action admin after aggregate all also always
-syn keyword sqlKeyword contained analyse and any as asc assertion assignment asymmetric attach attribute
-syn keyword sqlKeyword contained authorization backward basetype before between binary both by
-syn keyword sqlKeyword contained bypassrls cache call called cascade cascaded case cast catalog century chain
-syn keyword sqlKeyword contained characteristics check class coalesce collate collation column
-syn keyword sqlKeyword contained columns combinefunc comments committed concurrently configuration
-syn keyword sqlKeyword contained conflict connection constraint content continue conversion cost
-syn keyword sqlKeyword contained createdb createrole cross csv current current_catalog current_date
-syn keyword sqlKeyword contained current_role current_schema current_time current_timestamp
-syn keyword sqlKeyword contained current_user cursor cycle data database day dec decade default defaults
-syn keyword sqlKeyword contained deferrable deferred definer delimiter delimiters depends desc
-syn keyword sqlKeyword contained deserialfunc detach dictionary disable distinct document domain dow doy each
-syn keyword sqlKeyword contained else enable encoding encrypted enum epoch escape event except exclude
-syn keyword sqlKeyword contained excluding exclusive exists expression extension external extract
-syn keyword sqlKeyword contained false family filter finalfunc finalfunc_extra finalfunc_modify
-syn keyword sqlKeyword contained first float following for force foreign forward freeze from full function
-syn keyword sqlKeyword contained functions generated global granted greatest group grouping groups
-syn keyword sqlKeyword contained handler having header hold hour hypothetical identity if ilike
-syn keyword sqlKeyword contained immediate immutable implicit in include including increment index indexes
-syn keyword sqlKeyword contained inherit inherits initcond initially inline inner inout input
-syn keyword sqlKeyword contained insensitive instead intersect into invoker is isnull isodow isolation
-syn keyword sqlKeyword contained isoyear join key language large last lateral lc_collate lc_ctype leading
-syn keyword sqlKeyword contained leakproof least left level like limit local locale localtime
-syn keyword sqlKeyword contained localtimestamp location locked logged login mapping match materialized
-syn keyword sqlKeyword contained maxvalue method mfinalfunc mfinalfunc_extra mfinalfunc_modify
-syn keyword sqlKeyword contained microseconds millennium milliseconds minitcond minute minvalue
-syn keyword sqlKeyword contained minvfunc mode month msfunc msspace mstype name names national natural nchar
-syn keyword sqlKeyword contained new next nfc nfd nfkc nfkd no nobypassrls nocreatedb nocreaterole
-syn keyword sqlKeyword contained noinherit nologin none noreplication normalize normalized nosuperuser
-syn keyword sqlKeyword contained not nothing notnull nowait null nullif nulls object of off offset oids
-syn keyword sqlKeyword contained old on only operator option options or order ordinality others out
-syn keyword sqlKeyword contained outer over overlaps overlay overriding owned owner parallel parser
-syn keyword sqlKeyword contained partial partition passing password permissive placing plans policy
-syn keyword sqlKeyword contained position preceding preserve primary prior privileges procedural
-syn keyword sqlKeyword contained procedure procedures program provider public publication quarter quote
-syn keyword sqlKeyword contained range read read_write readonly recheck recursive ref references
-syn keyword sqlKeyword contained referencing relative rename repeatable replace replica replication
-syn keyword sqlKeyword contained restart restrict restricted restrictive returning returns right role
-syn keyword sqlKeyword contained rollup routine routines row rows rule safe schema schemas scroll search
-syn keyword sqlKeyword contained second sequence sequences serialfunc serializable server session
-syn keyword sqlKeyword contained session_user setof sets sfunc share shareable similar simple skip
-syn keyword sqlKeyword contained snapshot some sortop sql sspace stable standalone statement statistics
-syn keyword sqlKeyword contained stdin stdout storage stored strict strip stype subscription
-syn keyword sqlKeyword contained substring superuser support symmetric sysid system table tables
-syn keyword sqlKeyword contained tablesample tablespace temp template temporary then ties timezone
-syn keyword sqlKeyword contained timezone_hour timezone_minute to trailing transform treat trigger trim true
-syn keyword sqlKeyword contained trusted type types uescape unbounded uncommitted unencrypted union
-syn keyword sqlKeyword contained unique unknown unlogged unsafe until usage user using valid validate
-syn keyword sqlKeyword contained validator value variadic verbose version view views volatile week when
-syn keyword sqlKeyword contained where whitespace window with within without wrapper write
-syn keyword sqlKeyword contained xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlnamespaces
-syn keyword sqlKeyword contained xmlparse xmlpi xmlroot xmlserialize xmltable year yes
+syn keyword sqlKeyword contained analyse and any as asc asensitive assertion assignment asymmetric atomic
+syn keyword sqlKeyword contained attach attribute authorization backward basetype before between
+syn keyword sqlKeyword contained binary both breadth by bypassrls cache call called cascade cascaded case
+syn keyword sqlKeyword contained cast catalog century chain characteristics check class coalesce
+syn keyword sqlKeyword contained collate collation column columns combinefunc comments committed
+syn keyword sqlKeyword contained compression concurrently configuration conflict connection constraint
+syn keyword sqlKeyword contained content continue conversion cost createdb createrole cross csv
+syn keyword sqlKeyword contained current current_catalog current_date current_role current_schema
+syn keyword sqlKeyword contained current_time current_timestamp current_user cursor cycle data
+syn keyword sqlKeyword contained database day dec decade default defaults deferrable deferred definer
+syn keyword sqlKeyword contained delimiter delimiters depends depth desc deserialfunc detach dictionary
+syn keyword sqlKeyword contained disable distinct document domain dow doy each else enable encoding
+syn keyword sqlKeyword contained encrypted enum epoch escape event except exclude excluding exclusive
+syn keyword sqlKeyword contained exists expression extension external extract false family filter
+syn keyword sqlKeyword contained finalfunc finalfunc_extra finalfunc_modify finalize first float
+syn keyword sqlKeyword contained following for force foreign forward freeze from full function functions
+syn keyword sqlKeyword contained generated global granted greatest group grouping groups handler having
+syn keyword sqlKeyword contained header hold hour hypothetical identity if ilike immediate immutable
+syn keyword sqlKeyword contained implicit in include including increment index indexes inherit
+syn keyword sqlKeyword contained inherits initcond initially inline inner inout input insensitive instead
+syn keyword sqlKeyword contained intersect into invoker is isnull isodow isolation isoyear join key
+syn keyword sqlKeyword contained language large last lateral lc_collate lc_ctype leading leakproof
+syn keyword sqlKeyword contained least left level like limit local locale localtime localtimestamp
+syn keyword sqlKeyword contained location locked logged login mapping match materialized maxvalue method
+syn keyword sqlKeyword contained mfinalfunc mfinalfunc_extra mfinalfunc_modify microseconds
+syn keyword sqlKeyword contained millennium milliseconds minitcond minute minvalue minvfunc mode month
+syn keyword sqlKeyword contained msfunc msspace mstype name names national natural nchar new next nfc nfd
+syn keyword sqlKeyword contained nfkc nfkd no nobypassrls nocreatedb nocreaterole noinherit nologin
+syn keyword sqlKeyword contained none noreplication normalize normalized nosuperuser not nothing
+syn keyword sqlKeyword contained notnull nowait null nullif nulls object of off offset oids old on only
+syn keyword sqlKeyword contained operator option options or order ordinality others out outer over
+syn keyword sqlKeyword contained overlaps overlay overriding owned owner parallel parser partial partition
+syn keyword sqlKeyword contained passing password permissive placing plans policy position
+syn keyword sqlKeyword contained preceding preserve primary prior privileges procedural procedure
+syn keyword sqlKeyword contained procedures program provider public publication quarter quote range read
+syn keyword sqlKeyword contained read_write readonly recheck recursive ref references referencing
+syn keyword sqlKeyword contained relative rename repeatable replace replica replication restart restrict
+syn keyword sqlKeyword contained restricted restrictive return returning returns right role rollup
+syn keyword sqlKeyword contained routine routines row rows rule safe schema schemas scroll search second
+syn keyword sqlKeyword contained sequence sequences serialfunc serializable server session
+syn keyword sqlKeyword contained session_user setof sets sfunc share shareable similar simple skip snapshot
+syn keyword sqlKeyword contained some sortop sql sspace stable standalone statement statistics stdin
+syn keyword sqlKeyword contained stdout storage stored strict strip stype subscription substring
+syn keyword sqlKeyword contained superuser support symmetric sysid system table tables tablesample
+syn keyword sqlKeyword contained tablespace temp template temporary then ties timezone timezone_hour
+syn keyword sqlKeyword contained timezone_minute to trailing transform treat trigger trim true trusted
+syn keyword sqlKeyword contained type types uescape unbounded uncommitted unencrypted union unique
+syn keyword sqlKeyword contained unknown unlogged unsafe until usage user using valid validate validator
+syn keyword sqlKeyword contained value variadic verbose version view views volatile week when where
+syn keyword sqlKeyword contained whitespace window with within without wrapper write xmlattributes
+syn keyword sqlKeyword contained xmlconcat xmlelement xmlexists xmlforest xmlnamespaces xmlparse
+syn keyword sqlKeyword contained xmlpi xmlroot xmlserialize xmltable year yes
 syn keyword sqlConstant contained information_schema pg_catalog
 " Built-in functions
 syn keyword sqlFunction contained RI_FKey_cascade_del RI_FKey_cascade_upd RI_FKey_check_ins
@@ -140,155 +144,177 @@ syn keyword sqlFunction contained aclitemin aclitemout aclremove acos acosd acos
 syn keyword sqlFunction contained any_out anyarray_in anyarray_out anyarray_recv anyarray_send
 syn keyword sqlFunction contained anycompatible_in anycompatible_out anycompatiblearray_in
 syn keyword sqlFunction contained anycompatiblearray_out anycompatiblearray_recv
-syn keyword sqlFunction contained anycompatiblearray_send anycompatiblenonarray_in anycompatiblenonarray_out
-syn keyword sqlFunction contained anycompatiblerange_in anycompatiblerange_out anyelement_in
-syn keyword sqlFunction contained anyelement_out anyenum_in anyenum_out anynonarray_in anynonarray_out
-syn keyword sqlFunction contained anyrange_in anyrange_out anytextcat area areajoinsel areasel array_agg
-syn keyword sqlFunction contained array_agg_array_finalfn array_agg_array_transfn
-syn keyword sqlFunction contained array_agg_finalfn array_agg_transfn array_append array_cat array_dims array_eq
-syn keyword sqlFunction contained array_fill array_ge array_gt array_in array_larger array_le
-syn keyword sqlFunction contained array_length array_lower array_lt array_ndims array_ne array_out
-syn keyword sqlFunction contained array_position array_positions array_prepend array_recv array_remove
-syn keyword sqlFunction contained array_replace array_send array_smaller array_to_json
-syn keyword sqlFunction contained array_to_string array_to_tsvector array_typanalyze array_unnest_support
-syn keyword sqlFunction contained array_upper arraycontained arraycontains arraycontjoinsel
-syn keyword sqlFunction contained arraycontsel arrayoverlap ascii asin asind asinh atan atan2 atan2d atand
-syn keyword sqlFunction contained atanh avg bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
-syn keyword sqlFunction contained binary_upgrade_create_empty_extension
-syn keyword sqlFunction contained binary_upgrade_set_missing_value binary_upgrade_set_next_array_pg_type_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_index_pg_class_oid binary_upgrade_set_next_pg_authid_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_pg_enum_oid binary_upgrade_set_next_pg_type_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_type_oid binary_upgrade_set_record_init_privs
-syn keyword sqlFunction contained bit bit_and bit_in bit_length bit_or bit_out bit_recv bit_send bitand
-syn keyword sqlFunction contained bitcat bitcmp biteq bitge bitgt bitle bitlt bitne bitnot bitor
+syn keyword sqlFunction contained anycompatiblearray_send anycompatiblemultirange_in anycompatiblemultirange_out
+syn keyword sqlFunction contained anycompatiblenonarray_in anycompatiblenonarray_out
+syn keyword sqlFunction contained anycompatiblerange_in anycompatiblerange_out anyelement_in anyelement_out
+syn keyword sqlFunction contained anyenum_in anyenum_out anymultirange_in anymultirange_out
+syn keyword sqlFunction contained anynonarray_in anynonarray_out anyrange_in anyrange_out anytextcat area
+syn keyword sqlFunction contained areajoinsel areasel array_agg array_agg_array_finalfn
+syn keyword sqlFunction contained array_agg_array_transfn array_agg_finalfn array_agg_transfn array_append
+syn keyword sqlFunction contained array_cat array_dims array_eq array_fill array_ge array_gt
+syn keyword sqlFunction contained array_in array_larger array_le array_length array_lower array_lt
+syn keyword sqlFunction contained array_ndims array_ne array_out array_position array_positions
+syn keyword sqlFunction contained array_prepend array_recv array_remove array_replace array_send
+syn keyword sqlFunction contained array_smaller array_subscript_handler array_to_json array_to_string
+syn keyword sqlFunction contained array_to_tsvector array_typanalyze array_unnest_support array_upper
+syn keyword sqlFunction contained arraycontained arraycontains arraycontjoinsel arraycontsel
+syn keyword sqlFunction contained arrayoverlap ascii asin asind asinh atan atan2 atan2d atand atanh avg
+syn keyword sqlFunction contained bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
+syn keyword sqlFunction contained binary_upgrade_create_empty_extension binary_upgrade_set_missing_value
+syn keyword sqlFunction contained binary_upgrade_set_next_array_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid binary_upgrade_set_next_index_pg_class_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_multirange_array_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_multirange_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_pg_authid_oid binary_upgrade_set_next_pg_enum_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_class_oid binary_upgrade_set_record_init_privs bit bit_and
+syn keyword sqlFunction contained bit_count bit_in bit_length bit_or bit_out bit_recv bit_send bit_xor
+syn keyword sqlFunction contained bitand bitcat bitcmp biteq bitge bitgt bitle bitlt bitne bitnot bitor
 syn keyword sqlFunction contained bitshiftleft bitshiftright bittypmodin bittypmodout bitxor bool
-syn keyword sqlFunction contained bool_accum bool_accum_inv bool_alltrue bool_and bool_anytrue bool_or
-syn keyword sqlFunction contained booland_statefunc booleq boolge boolgt boolin boolle boollt boolne
-syn keyword sqlFunction contained boolor_statefunc boolout boolrecv boolsend bound_box box box_above
-syn keyword sqlFunction contained box_above_eq box_add box_below box_below_eq box_center box_contain
-syn keyword sqlFunction contained box_contain_pt box_contained box_distance box_div box_eq box_ge
-syn keyword sqlFunction contained box_gt box_in box_intersect box_le box_left box_lt box_mul box_out
-syn keyword sqlFunction contained box_overabove box_overbelow box_overlap box_overleft
+syn keyword sqlFunction contained bool_accum bool_accum_inv bool_alltrue bool_and bool_anytrue
+syn keyword sqlFunction contained bool_or booland_statefunc booleq boolge boolgt boolin boolle boollt
+syn keyword sqlFunction contained boolne boolor_statefunc boolout boolrecv boolsend bound_box box
+syn keyword sqlFunction contained box_above box_above_eq box_add box_below box_below_eq box_center
+syn keyword sqlFunction contained box_contain box_contain_pt box_contained box_distance box_div box_eq
+syn keyword sqlFunction contained box_ge box_gt box_in box_intersect box_le box_left box_lt box_mul
+syn keyword sqlFunction contained box_out box_overabove box_overbelow box_overlap box_overleft
 syn keyword sqlFunction contained box_overright box_recv box_right box_same box_send box_sub bpchar
 syn keyword sqlFunction contained bpchar_larger bpchar_pattern_ge bpchar_pattern_gt bpchar_pattern_le
 syn keyword sqlFunction contained bpchar_pattern_lt bpchar_smaller bpchar_sortsupport bpcharcmp
-syn keyword sqlFunction contained bpchareq bpcharge bpchargt bpchariclike bpcharicnlike bpcharicregexeq
-syn keyword sqlFunction contained bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt bpcharne
-syn keyword sqlFunction contained bpcharnlike bpcharout bpcharrecv bpcharregexeq bpcharregexne
-syn keyword sqlFunction contained bpcharsend bpchartypmodin bpchartypmodout brin_desummarize_range
-syn keyword sqlFunction contained brin_inclusion_add_value brin_inclusion_consistent
+syn keyword sqlFunction contained bpchareq bpcharge bpchargt bpchariclike bpcharicnlike
+syn keyword sqlFunction contained bpcharicregexeq bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt
+syn keyword sqlFunction contained bpcharne bpcharnlike bpcharout bpcharrecv bpcharregexeq bpcharregexne
+syn keyword sqlFunction contained bpcharsend bpchartypmodin bpchartypmodout brin_bloom_add_value
+syn keyword sqlFunction contained brin_bloom_consistent brin_bloom_opcinfo brin_bloom_options
+syn keyword sqlFunction contained brin_bloom_summary_in brin_bloom_summary_out
+syn keyword sqlFunction contained brin_bloom_summary_recv brin_bloom_summary_send brin_bloom_union
+syn keyword sqlFunction contained brin_desummarize_range brin_inclusion_add_value brin_inclusion_consistent
 syn keyword sqlFunction contained brin_inclusion_opcinfo brin_inclusion_union brin_minmax_add_value
-syn keyword sqlFunction contained brin_minmax_consistent brin_minmax_opcinfo brin_minmax_union
-syn keyword sqlFunction contained brin_summarize_new_values brin_summarize_range brinhandler broadcast
-syn keyword sqlFunction contained btarraycmp btboolcmp btbpchar_pattern_cmp
-syn keyword sqlFunction contained btbpchar_pattern_sortsupport btcharcmp btequalimage btfloat48cmp btfloat4cmp
-syn keyword sqlFunction contained btfloat4sortsupport btfloat84cmp btfloat8cmp btfloat8sortsupport bthandler
-syn keyword sqlFunction contained btint24cmp btint28cmp btint2cmp btint2sortsupport btint42cmp
-syn keyword sqlFunction contained btint48cmp btint4cmp btint4sortsupport btint82cmp btint84cmp
-syn keyword sqlFunction contained btint8cmp btint8sortsupport btnamecmp btnamesortsupport btnametextcmp
-syn keyword sqlFunction contained btoidcmp btoidsortsupport btoidvectorcmp btrecordcmp
-syn keyword sqlFunction contained btrecordimagecmp btrim bttext_pattern_cmp bttext_pattern_sortsupport
-syn keyword sqlFunction contained bttextcmp bttextnamecmp bttextsortsupport bttidcmp btvarstrequalimage
-syn keyword sqlFunction contained bytea_sortsupport bytea_string_agg_finalfn
-syn keyword sqlFunction contained bytea_string_agg_transfn byteacat byteacmp byteaeq byteage byteagt byteain byteale
-syn keyword sqlFunction contained bytealike bytealt byteane byteanlike byteaout bytearecv byteasend
-syn keyword sqlFunction contained cardinality cash_cmp cash_div_cash cash_div_flt4 cash_div_flt8
-syn keyword sqlFunction contained cash_div_int2 cash_div_int4 cash_div_int8 cash_eq cash_ge cash_gt
-syn keyword sqlFunction contained cash_in cash_le cash_lt cash_mi cash_mul_flt4 cash_mul_flt8
-syn keyword sqlFunction contained cash_mul_int2 cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl
-syn keyword sqlFunction contained cash_recv cash_send cash_words cashlarger cashsmaller cbrt ceil ceiling
-syn keyword sqlFunction contained center char char_length character_length chareq charge chargt
-syn keyword sqlFunction contained charin charle charlt charne charout charrecv charsend chr cideq cidin
-syn keyword sqlFunction contained cidout cidr cidr_in cidr_out cidr_recv cidr_send cidrecv cidsend
-syn keyword sqlFunction contained circle circle_above circle_add_pt circle_below circle_center
-syn keyword sqlFunction contained circle_contain circle_contain_pt circle_contained circle_distance
-syn keyword sqlFunction contained circle_div_pt circle_eq circle_ge circle_gt circle_in circle_le
-syn keyword sqlFunction contained circle_left circle_lt circle_mul_pt circle_ne circle_out
-syn keyword sqlFunction contained circle_overabove circle_overbelow circle_overlap circle_overleft
-syn keyword sqlFunction contained circle_overright circle_recv circle_right circle_same circle_send
-syn keyword sqlFunction contained circle_sub_pt clock_timestamp close_lb close_ls close_lseg close_pb
-syn keyword sqlFunction contained close_pl close_ps close_sb close_sl col_description concat concat_ws
-syn keyword sqlFunction contained contjoinsel contsel convert convert_from convert_to corr cos cosd cosh
-syn keyword sqlFunction contained cot cotd count covar_pop covar_samp cstring_in cstring_out
-syn keyword sqlFunction contained cstring_recv cstring_send cume_dist cume_dist_final current_database
-syn keyword sqlFunction contained current_query current_schema current_schemas current_setting
-syn keyword sqlFunction contained current_user currtid currtid2 currval cursor_to_xml
-syn keyword sqlFunction contained cursor_to_xmlschema database_to_xml database_to_xml_and_xmlschema
-syn keyword sqlFunction contained database_to_xmlschema date date_cmp date_cmp_timestamp date_cmp_timestamptz
-syn keyword sqlFunction contained date_eq date_eq_timestamp date_eq_timestamptz date_ge
-syn keyword sqlFunction contained date_ge_timestamp date_ge_timestamptz date_gt date_gt_timestamp
-syn keyword sqlFunction contained date_gt_timestamptz date_in date_larger date_le date_le_timestamp
-syn keyword sqlFunction contained date_le_timestamptz date_lt date_lt_timestamp date_lt_timestamptz
-syn keyword sqlFunction contained date_mi date_mi_interval date_mii date_ne date_ne_timestamp
-syn keyword sqlFunction contained date_ne_timestamptz date_out date_part date_pl_interval date_pli
-syn keyword sqlFunction contained date_recv date_send date_smaller date_sortsupport date_trunc daterange
-syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl
-syn keyword sqlFunction contained datetimetz_pl dcbrt decode degrees dense_rank dense_rank_final dexp diagonal
-syn keyword sqlFunction contained diameter dispell_init dispell_lexize dist_bl dist_bp dist_bs
-syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb
-syn keyword sqlFunction contained dist_pc dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps
-syn keyword sqlFunction contained dist_sb dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow
-syn keyword sqlFunction contained dround dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize
-syn keyword sqlFunction contained dsqrt dsynonym_init dsynonym_lexize dtrunc
-syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first enum_ge enum_gt enum_in
-syn keyword sqlFunction contained enum_larger enum_last enum_le enum_lt enum_ne enum_out enum_range
-syn keyword sqlFunction contained enum_recv enum_send enum_smaller eqjoinsel eqsel euc_cn_to_mic
-syn keyword sqlFunction contained euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_to_utf8
-syn keyword sqlFunction contained euc_jp_to_mic euc_jp_to_sjis euc_jp_to_utf8 euc_kr_to_mic
-syn keyword sqlFunction contained euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic euc_tw_to_utf8
-syn keyword sqlFunction contained event_trigger_in event_trigger_out every exp factorial family fdw_handler_in
-syn keyword sqlFunction contained fdw_handler_out first_value float4 float48div float48eq
-syn keyword sqlFunction contained float48ge float48gt float48le float48lt float48mi float48mul float48ne
-syn keyword sqlFunction contained float48pl float4_accum float4abs float4div float4eq float4ge
-syn keyword sqlFunction contained float4gt float4in float4larger float4le float4lt float4mi float4mul
-syn keyword sqlFunction contained float4ne float4out float4pl float4recv float4send float4smaller
-syn keyword sqlFunction contained float4um float4up float8 float84div float84eq float84ge float84gt
-syn keyword sqlFunction contained float84le float84lt float84mi float84mul float84ne float84pl
-syn keyword sqlFunction contained float8_accum float8_avg float8_combine float8_corr float8_covar_pop
-syn keyword sqlFunction contained float8_covar_samp float8_regr_accum float8_regr_avgx
-syn keyword sqlFunction contained float8_regr_avgy float8_regr_combine float8_regr_intercept float8_regr_r2
-syn keyword sqlFunction contained float8_regr_slope float8_regr_sxx float8_regr_sxy float8_regr_syy
-syn keyword sqlFunction contained float8_stddev_pop float8_stddev_samp float8_var_pop
-syn keyword sqlFunction contained float8_var_samp float8abs float8div float8eq float8ge float8gt float8in
-syn keyword sqlFunction contained float8larger float8le float8lt float8mi float8mul float8ne float8out
-syn keyword sqlFunction contained float8pl float8recv float8send float8smaller float8um float8up
-syn keyword sqlFunction contained floor flt4_mul_cash flt8_mul_cash fmgr_c_validator
-syn keyword sqlFunction contained fmgr_internal_validator fmgr_sql_validator format format_type gb18030_to_utf8
-syn keyword sqlFunction contained gbk_to_utf8 gcd gen_random_uuid generate_series
-syn keyword sqlFunction contained generate_series_int4_support generate_series_int8_support generate_subscripts
-syn keyword sqlFunction contained get_bit get_byte get_current_ts_config getdatabaseencoding
-syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix
-syn keyword sqlFunction contained gin_cmp_tslexeme gin_compare_jsonb gin_consistent_jsonb
-syn keyword sqlFunction contained gin_consistent_jsonb_path gin_extract_jsonb gin_extract_jsonb_path
-syn keyword sqlFunction contained gin_extract_jsonb_query gin_extract_jsonb_query_path gin_extract_tsquery
-syn keyword sqlFunction contained gin_extract_tsvector gin_triconsistent_jsonb
-syn keyword sqlFunction contained gin_triconsistent_jsonb_path gin_tsquery_consistent gin_tsquery_triconsistent
-syn keyword sqlFunction contained ginarrayconsistent ginarrayextract ginarraytriconsistent ginhandler
-syn keyword sqlFunction contained ginqueryarrayextract gist_box_consistent gist_box_distance
-syn keyword sqlFunction contained gist_box_penalty gist_box_picksplit gist_box_same gist_box_union
-syn keyword sqlFunction contained gist_circle_compress gist_circle_consistent
-syn keyword sqlFunction contained gist_circle_distance gist_point_compress gist_point_consistent
-syn keyword sqlFunction contained gist_point_distance gist_point_fetch gist_poly_compress gist_poly_consistent
-syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress
-syn keyword sqlFunction contained gtsquery_consistent gtsquery_penalty gtsquery_picksplit gtsquery_same
-syn keyword sqlFunction contained gtsquery_union gtsvector_compress gtsvector_consistent
-syn keyword sqlFunction contained gtsvector_decompress gtsvector_options gtsvector_penalty gtsvector_picksplit
+syn keyword sqlFunction contained brin_minmax_consistent brin_minmax_multi_add_value
+syn keyword sqlFunction contained brin_minmax_multi_consistent brin_minmax_multi_distance_date
+syn keyword sqlFunction contained brin_minmax_multi_distance_float4 brin_minmax_multi_distance_float8
+syn keyword sqlFunction contained brin_minmax_multi_distance_inet brin_minmax_multi_distance_int2
+syn keyword sqlFunction contained brin_minmax_multi_distance_int4
+syn keyword sqlFunction contained brin_minmax_multi_distance_int8 brin_minmax_multi_distance_interval
+syn keyword sqlFunction contained brin_minmax_multi_distance_macaddr brin_minmax_multi_distance_macaddr8
+syn keyword sqlFunction contained brin_minmax_multi_distance_numeric brin_minmax_multi_distance_pg_lsn
+syn keyword sqlFunction contained brin_minmax_multi_distance_tid brin_minmax_multi_distance_time
+syn keyword sqlFunction contained brin_minmax_multi_distance_timestamp
+syn keyword sqlFunction contained brin_minmax_multi_distance_timetz brin_minmax_multi_distance_uuid
+syn keyword sqlFunction contained brin_minmax_multi_opcinfo brin_minmax_multi_options brin_minmax_multi_summary_in
+syn keyword sqlFunction contained brin_minmax_multi_summary_out brin_minmax_multi_summary_recv
+syn keyword sqlFunction contained brin_minmax_multi_summary_send brin_minmax_multi_union
+syn keyword sqlFunction contained brin_minmax_opcinfo brin_minmax_union brin_summarize_new_values
+syn keyword sqlFunction contained brin_summarize_range brinhandler broadcast btarraycmp btboolcmp
+syn keyword sqlFunction contained btbpchar_pattern_cmp btbpchar_pattern_sortsupport btcharcmp
+syn keyword sqlFunction contained btequalimage btfloat48cmp btfloat4cmp btfloat4sortsupport btfloat84cmp
+syn keyword sqlFunction contained btfloat8cmp btfloat8sortsupport bthandler btint24cmp btint28cmp
+syn keyword sqlFunction contained btint2cmp btint2sortsupport btint42cmp btint48cmp btint4cmp
+syn keyword sqlFunction contained btint4sortsupport btint82cmp btint84cmp btint8cmp btint8sortsupport
+syn keyword sqlFunction contained btnamecmp btnamesortsupport btnametextcmp btoidcmp
+syn keyword sqlFunction contained btoidsortsupport btoidvectorcmp btrecordcmp btrecordimagecmp btrim
+syn keyword sqlFunction contained bttext_pattern_cmp bttext_pattern_sortsupport bttextcmp bttextnamecmp
+syn keyword sqlFunction contained bttextsortsupport bttidcmp btvarstrequalimage bytea_sortsupport
+syn keyword sqlFunction contained bytea_string_agg_finalfn bytea_string_agg_transfn byteacat
+syn keyword sqlFunction contained byteacmp byteaeq byteage byteagt byteain byteale bytealike bytealt
+syn keyword sqlFunction contained byteane byteanlike byteaout bytearecv byteasend cardinality cash_cmp
+syn keyword sqlFunction contained cash_div_cash cash_div_flt4 cash_div_flt8 cash_div_int2
+syn keyword sqlFunction contained cash_div_int4 cash_div_int8 cash_eq cash_ge cash_gt cash_in cash_le
+syn keyword sqlFunction contained cash_lt cash_mi cash_mul_flt4 cash_mul_flt8 cash_mul_int2
+syn keyword sqlFunction contained cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl cash_recv cash_send
+syn keyword sqlFunction contained cash_words cashlarger cashsmaller cbrt ceil ceiling center char_length
+syn keyword sqlFunction contained character_length chareq charge chargt charin charle charlt charne
+syn keyword sqlFunction contained charout charrecv charsend chr cideq cidin cidout cidr cidr_in cidr_out
+syn keyword sqlFunction contained cidr_recv cidr_send cidrecv cidsend circle circle_above
+syn keyword sqlFunction contained circle_add_pt circle_below circle_center circle_contain
+syn keyword sqlFunction contained circle_contain_pt circle_contained circle_distance circle_div_pt circle_eq
+syn keyword sqlFunction contained circle_ge circle_gt circle_in circle_le circle_left circle_lt
+syn keyword sqlFunction contained circle_mul_pt circle_ne circle_out circle_overabove circle_overbelow
+syn keyword sqlFunction contained circle_overlap circle_overleft circle_overright circle_recv
+syn keyword sqlFunction contained circle_right circle_same circle_send circle_sub_pt clock_timestamp
+syn keyword sqlFunction contained close_lb close_ls close_lseg close_pb close_pl close_ps close_sb
+syn keyword sqlFunction contained close_sl col_description concat concat_ws contjoinsel contsel convert
+syn keyword sqlFunction contained convert_from convert_to corr cos cosd cosh cot cotd count covar_pop
+syn keyword sqlFunction contained covar_samp cstring_in cstring_out cstring_recv cstring_send
+syn keyword sqlFunction contained cume_dist cume_dist_final current_database current_query
+syn keyword sqlFunction contained current_schema current_schemas current_setting current_user currtid2
+syn keyword sqlFunction contained currval cursor_to_xml cursor_to_xmlschema database_to_xml
+syn keyword sqlFunction contained database_to_xml_and_xmlschema database_to_xmlschema date date_bin date_cmp
+syn keyword sqlFunction contained date_cmp_timestamp date_cmp_timestamptz date_eq
+syn keyword sqlFunction contained date_eq_timestamp date_eq_timestamptz date_ge date_ge_timestamp
+syn keyword sqlFunction contained date_ge_timestamptz date_gt date_gt_timestamp date_gt_timestamptz date_in
+syn keyword sqlFunction contained date_larger date_le date_le_timestamp date_le_timestamptz date_lt
+syn keyword sqlFunction contained date_lt_timestamp date_lt_timestamptz date_mi date_mi_interval
+syn keyword sqlFunction contained date_mii date_ne date_ne_timestamp date_ne_timestamptz date_out
+syn keyword sqlFunction contained date_part date_pl_interval date_pli date_recv date_send
+syn keyword sqlFunction contained date_smaller date_sortsupport date_trunc datemultirange daterange
+syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl datetimetz_pl dcbrt
+syn keyword sqlFunction contained decode degrees dense_rank dense_rank_final dexp diagonal diameter
+syn keyword sqlFunction contained dispell_init dispell_lexize dist_bl dist_bp dist_bs dist_cpoint
+syn keyword sqlFunction contained dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb dist_pc
+syn keyword sqlFunction contained dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps dist_sb
+syn keyword sqlFunction contained dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow dround
+syn keyword sqlFunction contained dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize dsqrt
+syn keyword sqlFunction contained dsynonym_init dsynonym_lexize dtrunc elem_contained_by_multirange
+syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first
+syn keyword sqlFunction contained enum_ge enum_gt enum_in enum_larger enum_last enum_le enum_lt enum_ne
+syn keyword sqlFunction contained enum_out enum_range enum_recv enum_send enum_smaller eqjoinsel
+syn keyword sqlFunction contained eqsel euc_cn_to_mic euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004
+syn keyword sqlFunction contained euc_jis_2004_to_utf8 euc_jp_to_mic euc_jp_to_sjis
+syn keyword sqlFunction contained euc_jp_to_utf8 euc_kr_to_mic euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic
+syn keyword sqlFunction contained euc_tw_to_utf8 event_trigger_in event_trigger_out every exp extract
+syn keyword sqlFunction contained factorial family fdw_handler_in fdw_handler_out first_value
+syn keyword sqlFunction contained float4 float48div float48eq float48ge float48gt float48le float48lt
+syn keyword sqlFunction contained float48mi float48mul float48ne float48pl float4_accum float4abs
+syn keyword sqlFunction contained float4div float4eq float4ge float4gt float4in float4larger float4le
+syn keyword sqlFunction contained float4lt float4mi float4mul float4ne float4out float4pl float4recv
+syn keyword sqlFunction contained float4send float4smaller float4um float4up float8 float84div
+syn keyword sqlFunction contained float84eq float84ge float84gt float84le float84lt float84mi float84mul
+syn keyword sqlFunction contained float84ne float84pl float8_accum float8_avg float8_combine
+syn keyword sqlFunction contained float8_corr float8_covar_pop float8_covar_samp float8_regr_accum
+syn keyword sqlFunction contained float8_regr_avgx float8_regr_avgy float8_regr_combine
+syn keyword sqlFunction contained float8_regr_intercept float8_regr_r2 float8_regr_slope float8_regr_sxx
+syn keyword sqlFunction contained float8_regr_sxy float8_regr_syy float8_stddev_pop
+syn keyword sqlFunction contained float8_stddev_samp float8_var_pop float8_var_samp float8abs float8div float8eq
+syn keyword sqlFunction contained float8ge float8gt float8in float8larger float8le float8lt float8mi
+syn keyword sqlFunction contained float8mul float8ne float8out float8pl float8recv float8send
+syn keyword sqlFunction contained float8smaller float8um float8up floor flt4_mul_cash flt8_mul_cash
+syn keyword sqlFunction contained fmgr_c_validator fmgr_internal_validator fmgr_sql_validator format
+syn keyword sqlFunction contained format_type gb18030_to_utf8 gbk_to_utf8 gcd gen_random_uuid
+syn keyword sqlFunction contained generate_series generate_series_int4_support
+syn keyword sqlFunction contained generate_series_int8_support generate_subscripts get_bit get_byte
+syn keyword sqlFunction contained get_current_ts_config getdatabaseencoding getpgusername gin_clean_pending_list
+syn keyword sqlFunction contained gin_cmp_prefix gin_cmp_tslexeme gin_compare_jsonb
+syn keyword sqlFunction contained gin_consistent_jsonb gin_consistent_jsonb_path gin_extract_jsonb
+syn keyword sqlFunction contained gin_extract_jsonb_path gin_extract_jsonb_query
+syn keyword sqlFunction contained gin_extract_jsonb_query_path gin_extract_tsquery gin_extract_tsvector
+syn keyword sqlFunction contained gin_triconsistent_jsonb gin_triconsistent_jsonb_path gin_tsquery_consistent
+syn keyword sqlFunction contained gin_tsquery_triconsistent ginarrayconsistent ginarrayextract
+syn keyword sqlFunction contained ginarraytriconsistent ginhandler ginqueryarrayextract
+syn keyword sqlFunction contained gist_box_consistent gist_box_distance gist_box_penalty gist_box_picksplit
+syn keyword sqlFunction contained gist_box_same gist_box_union gist_circle_compress
+syn keyword sqlFunction contained gist_circle_consistent gist_circle_distance gist_point_compress
+syn keyword sqlFunction contained gist_point_consistent gist_point_distance gist_point_fetch
+syn keyword sqlFunction contained gist_point_sortsupport gist_poly_compress gist_poly_consistent
+syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress gtsquery_consistent
+syn keyword sqlFunction contained gtsquery_penalty gtsquery_picksplit gtsquery_same gtsquery_union
+syn keyword sqlFunction contained gtsvector_compress gtsvector_consistent gtsvector_decompress
+syn keyword sqlFunction contained gtsvector_options gtsvector_penalty gtsvector_picksplit
 syn keyword sqlFunction contained gtsvector_same gtsvector_union gtsvectorin gtsvectorout
 syn keyword sqlFunction contained has_any_column_privilege has_column_privilege has_database_privilege
 syn keyword sqlFunction contained has_foreign_data_wrapper_privilege has_function_privilege
 syn keyword sqlFunction contained has_language_privilege has_schema_privilege has_sequence_privilege
-syn keyword sqlFunction contained has_server_privilege has_table_privilege
-syn keyword sqlFunction contained has_tablespace_privilege has_type_privilege hash_aclitem hash_aclitem_extended
-syn keyword sqlFunction contained hash_array hash_array_extended hash_numeric hash_numeric_extended
-syn keyword sqlFunction contained hash_range hash_range_extended hashbpchar hashbpcharextended
+syn keyword sqlFunction contained has_server_privilege has_table_privilege has_tablespace_privilege
+syn keyword sqlFunction contained has_type_privilege hash_aclitem hash_aclitem_extended hash_array
+syn keyword sqlFunction contained hash_array_extended hash_multirange hash_multirange_extended
+syn keyword sqlFunction contained hash_numeric hash_numeric_extended hash_range hash_range_extended
+syn keyword sqlFunction contained hash_record hash_record_extended hashbpchar hashbpcharextended
 syn keyword sqlFunction contained hashchar hashcharextended hashenum hashenumextended hashfloat4
 syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler
 syn keyword sqlFunction contained hashinet hashinetextended hashint2 hashint2extended hashint4
 syn keyword sqlFunction contained hashint4extended hashint8 hashint8extended hashmacaddr hashmacaddr8
-syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname hashnameextended
-syn keyword sqlFunction contained hashoid hashoidextended hashoidvector hashoidvectorextended
+syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname
+syn keyword sqlFunction contained hashnameextended hashoid hashoidextended hashoidvector hashoidvectorextended
 syn keyword sqlFunction contained hashtext hashtextextended hashtid hashtidextended hashvarlena
 syn keyword sqlFunction contained hashvarlenaextended heap_tableam_handler height host hostmask
 syn keyword sqlFunction contained iclikejoinsel iclikesel icnlikejoinsel icnlikesel icregexeqjoinsel
@@ -297,144 +323,159 @@ syn keyword sqlFunction contained index_am_handler_in index_am_handler_out inet_
 syn keyword sqlFunction contained inet_gist_compress inet_gist_consistent inet_gist_fetch
 syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union
 syn keyword sqlFunction contained inet_in inet_merge inet_out inet_recv inet_same_family inet_send
-syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose inet_spg_config
-syn keyword sqlFunction contained inet_spg_inner_consistent inet_spg_leaf_consistent
+syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose
+syn keyword sqlFunction contained inet_spg_config inet_spg_inner_consistent inet_spg_leaf_consistent
 syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap
 syn keyword sqlFunction contained int2 int24div int24eq int24ge int24gt int24le int24lt int24mi
-syn keyword sqlFunction contained int24mul int24ne int24pl int28div int28eq int28ge int28gt int28le int28lt
-syn keyword sqlFunction contained int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
+syn keyword sqlFunction contained int24mul int24ne int24pl int28div int28eq int28ge int28gt int28le
+syn keyword sqlFunction contained int28lt int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
 syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs
 syn keyword sqlFunction contained int2and int2div int2eq int2ge int2gt int2in int2int4_sum int2larger
-syn keyword sqlFunction contained int2le int2lt int2mi int2mod int2mul int2ne int2not int2or int2out int2pl
-syn keyword sqlFunction contained int2recv int2send int2shl int2shr int2smaller int2um int2up
-syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor int4
-syn keyword sqlFunction contained int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
+syn keyword sqlFunction contained int2le int2lt int2mi int2mod int2mul int2ne int2not int2or int2out
+syn keyword sqlFunction contained int2pl int2recv int2send int2shl int2shr int2smaller int2um int2up
+syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor
+syn keyword sqlFunction contained int4 int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
 syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt
 syn keyword sqlFunction contained int48mi int48mul int48ne int48pl int4_accum int4_accum_inv
-syn keyword sqlFunction contained int4_avg_accum int4_avg_accum_inv int4_avg_combine int4_mul_cash int4_sum
-syn keyword sqlFunction contained int4abs int4and int4div int4eq int4ge int4gt int4in int4inc
-syn keyword sqlFunction contained int4larger int4le int4lt int4mi int4mod int4mul int4ne int4not int4or
-syn keyword sqlFunction contained int4out int4pl int4range int4range_canonical int4range_subdiff
-syn keyword sqlFunction contained int4recv int4send int4shl int4shr int4smaller int4um int4up int4xor int8
-syn keyword sqlFunction contained int82div int82eq int82ge int82gt int82le int82lt int82mi int82mul
-syn keyword sqlFunction contained int82ne int82pl int84div int84eq int84ge int84gt int84le int84lt
-syn keyword sqlFunction contained int84mi int84mul int84ne int84pl int8_accum int8_accum_inv int8_avg
-syn keyword sqlFunction contained int8_avg_accum int8_avg_accum_inv int8_avg_combine
-syn keyword sqlFunction contained int8_avg_deserialize int8_avg_serialize int8_mul_cash int8_sum int8abs
-syn keyword sqlFunction contained int8and int8dec int8dec_any int8div int8eq int8ge int8gt int8in int8inc
-syn keyword sqlFunction contained int8inc_any int8inc_float8_float8 int8larger int8le int8lt int8mi
-syn keyword sqlFunction contained int8mod int8mul int8ne int8not int8or int8out int8pl int8pl_inet
-syn keyword sqlFunction contained int8range int8range_canonical int8range_subdiff int8recv int8send
-syn keyword sqlFunction contained int8shl int8shr int8smaller int8um int8up int8xor integer_pl_date
-syn keyword sqlFunction contained inter_lb inter_sb inter_sl internal_in internal_out interval
-syn keyword sqlFunction contained interval_accum interval_accum_inv interval_avg interval_cmp
-syn keyword sqlFunction contained interval_combine interval_div interval_eq interval_ge interval_gt
-syn keyword sqlFunction contained interval_hash interval_hash_extended interval_in interval_larger
-syn keyword sqlFunction contained interval_le interval_lt interval_mi interval_mul interval_ne
-syn keyword sqlFunction contained interval_out interval_pl interval_pl_date interval_pl_time
-syn keyword sqlFunction contained interval_pl_timestamp interval_pl_timestamptz interval_pl_timetz
-syn keyword sqlFunction contained interval_recv interval_send interval_smaller interval_support
-syn keyword sqlFunction contained interval_um intervaltypmodin intervaltypmodout is_normalized isclosed
-syn keyword sqlFunction contained isempty isfinite ishorizontal iso8859_1_to_utf8 iso8859_to_utf8
-syn keyword sqlFunction contained iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866 isopen
-syn keyword sqlFunction contained isparallel isperp isvertical johab_to_utf8 json_agg json_agg_finalfn
-syn keyword sqlFunction contained json_agg_transfn json_array_element json_array_element_text
-syn keyword sqlFunction contained json_array_elements json_array_elements_text json_array_length
-syn keyword sqlFunction contained json_build_array json_build_object json_each json_each_text
-syn keyword sqlFunction contained json_extract_path json_extract_path_text json_in json_object
-syn keyword sqlFunction contained json_object_agg json_object_agg_finalfn json_object_agg_transfn
-syn keyword sqlFunction contained json_object_field json_object_field_text json_object_keys json_out
-syn keyword sqlFunction contained json_populate_record json_populate_recordset json_recv json_send
-syn keyword sqlFunction contained json_strip_nulls json_to_record json_to_recordset
-syn keyword sqlFunction contained json_to_tsvector json_typeof jsonb_agg jsonb_agg_finalfn jsonb_agg_transfn
-syn keyword sqlFunction contained jsonb_array_element jsonb_array_element_text
-syn keyword sqlFunction contained jsonb_array_elements jsonb_array_elements_text jsonb_array_length
-syn keyword sqlFunction contained jsonb_build_array jsonb_build_object jsonb_cmp jsonb_concat jsonb_contained
-syn keyword sqlFunction contained jsonb_contains jsonb_delete jsonb_delete_path jsonb_each
-syn keyword sqlFunction contained jsonb_each_text jsonb_eq jsonb_exists jsonb_exists_all jsonb_exists_any
-syn keyword sqlFunction contained jsonb_extract_path jsonb_extract_path_text jsonb_ge jsonb_gt
-syn keyword sqlFunction contained jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert jsonb_le
-syn keyword sqlFunction contained jsonb_lt jsonb_ne jsonb_object jsonb_object_agg
-syn keyword sqlFunction contained jsonb_object_agg_finalfn jsonb_object_agg_transfn jsonb_object_field
-syn keyword sqlFunction contained jsonb_object_field_text jsonb_object_keys jsonb_out jsonb_path_exists
-syn keyword sqlFunction contained jsonb_path_exists_opr jsonb_path_exists_tz jsonb_path_match
-syn keyword sqlFunction contained jsonb_path_match_opr jsonb_path_match_tz jsonb_path_query
-syn keyword sqlFunction contained jsonb_path_query_array jsonb_path_query_array_tz jsonb_path_query_first
-syn keyword sqlFunction contained jsonb_path_query_first_tz jsonb_path_query_tz
-syn keyword sqlFunction contained jsonb_populate_record jsonb_populate_recordset jsonb_pretty jsonb_recv
-syn keyword sqlFunction contained jsonb_send jsonb_set jsonb_set_lax jsonb_strip_nulls jsonb_to_record
+syn keyword sqlFunction contained int4_avg_accum int4_avg_accum_inv int4_avg_combine int4_mul_cash
+syn keyword sqlFunction contained int4_sum int4abs int4and int4div int4eq int4ge int4gt int4in int4inc
+syn keyword sqlFunction contained int4larger int4le int4lt int4mi int4mod int4mul int4multirange int4ne
+syn keyword sqlFunction contained int4not int4or int4out int4pl int4range int4range_canonical
+syn keyword sqlFunction contained int4range_subdiff int4recv int4send int4shl int4shr int4smaller int4um
+syn keyword sqlFunction contained int4up int4xor int8 int82div int82eq int82ge int82gt int82le int82lt
+syn keyword sqlFunction contained int82mi int82mul int82ne int82pl int84div int84eq int84ge int84gt
+syn keyword sqlFunction contained int84le int84lt int84mi int84mul int84ne int84pl int8_accum
+syn keyword sqlFunction contained int8_accum_inv int8_avg int8_avg_accum int8_avg_accum_inv
+syn keyword sqlFunction contained int8_avg_combine int8_avg_deserialize int8_avg_serialize int8_mul_cash
+syn keyword sqlFunction contained int8_sum int8abs int8and int8dec int8dec_any int8div int8eq int8ge
+syn keyword sqlFunction contained int8gt int8in int8inc int8inc_any int8inc_float8_float8 int8larger
+syn keyword sqlFunction contained int8le int8lt int8mi int8mod int8mul int8multirange int8ne int8not
+syn keyword sqlFunction contained int8or int8out int8pl int8pl_inet int8range int8range_canonical
+syn keyword sqlFunction contained int8range_subdiff int8recv int8send int8shl int8shr int8smaller
+syn keyword sqlFunction contained int8um int8up int8xor integer_pl_date inter_lb inter_sb inter_sl
+syn keyword sqlFunction contained internal_in internal_out interval interval_accum interval_accum_inv
+syn keyword sqlFunction contained interval_avg interval_cmp interval_combine interval_div
+syn keyword sqlFunction contained interval_eq interval_ge interval_gt interval_hash interval_hash_extended
+syn keyword sqlFunction contained interval_in interval_larger interval_le interval_lt interval_mi
+syn keyword sqlFunction contained interval_mul interval_ne interval_out interval_pl
+syn keyword sqlFunction contained interval_pl_date interval_pl_time interval_pl_timestamp
+syn keyword sqlFunction contained interval_pl_timestamptz interval_pl_timetz interval_recv interval_send
+syn keyword sqlFunction contained interval_smaller interval_support interval_um intervaltypmodin
+syn keyword sqlFunction contained intervaltypmodout is_normalized isclosed isempty isfinite ishorizontal
+syn keyword sqlFunction contained iso8859_1_to_utf8 iso8859_to_utf8 iso_to_koi8r iso_to_mic
+syn keyword sqlFunction contained iso_to_win1251 iso_to_win866 isopen isparallel isperp isvertical
+syn keyword sqlFunction contained johab_to_utf8 json_agg json_agg_finalfn json_agg_transfn
+syn keyword sqlFunction contained json_array_element json_array_element_text json_array_elements
+syn keyword sqlFunction contained json_array_elements_text json_array_length json_build_array json_build_object
+syn keyword sqlFunction contained json_each json_each_text json_extract_path
+syn keyword sqlFunction contained json_extract_path_text json_in json_object json_object_agg json_object_agg_finalfn
+syn keyword sqlFunction contained json_object_agg_transfn json_object_field
+syn keyword sqlFunction contained json_object_field_text json_object_keys json_out json_populate_record
+syn keyword sqlFunction contained json_populate_recordset json_recv json_send json_strip_nulls json_to_record
+syn keyword sqlFunction contained json_to_recordset json_to_tsvector json_typeof jsonb_agg
+syn keyword sqlFunction contained jsonb_agg_finalfn jsonb_agg_transfn jsonb_array_element
+syn keyword sqlFunction contained jsonb_array_element_text jsonb_array_elements jsonb_array_elements_text
+syn keyword sqlFunction contained jsonb_array_length jsonb_build_array jsonb_build_object
+syn keyword sqlFunction contained jsonb_cmp jsonb_concat jsonb_contained jsonb_contains jsonb_delete
+syn keyword sqlFunction contained jsonb_delete_path jsonb_each jsonb_each_text jsonb_eq jsonb_exists
+syn keyword sqlFunction contained jsonb_exists_all jsonb_exists_any jsonb_extract_path
+syn keyword sqlFunction contained jsonb_extract_path_text jsonb_ge jsonb_gt jsonb_hash jsonb_hash_extended
+syn keyword sqlFunction contained jsonb_in jsonb_insert jsonb_le jsonb_lt jsonb_ne jsonb_object
+syn keyword sqlFunction contained jsonb_object_agg jsonb_object_agg_finalfn jsonb_object_agg_transfn
+syn keyword sqlFunction contained jsonb_object_field jsonb_object_field_text jsonb_object_keys
+syn keyword sqlFunction contained jsonb_out jsonb_path_exists jsonb_path_exists_opr
+syn keyword sqlFunction contained jsonb_path_exists_tz jsonb_path_match jsonb_path_match_opr
+syn keyword sqlFunction contained jsonb_path_match_tz jsonb_path_query jsonb_path_query_array
+syn keyword sqlFunction contained jsonb_path_query_array_tz jsonb_path_query_first jsonb_path_query_first_tz
+syn keyword sqlFunction contained jsonb_path_query_tz jsonb_populate_record jsonb_populate_recordset
+syn keyword sqlFunction contained jsonb_pretty jsonb_recv jsonb_send jsonb_set jsonb_set_lax
+syn keyword sqlFunction contained jsonb_strip_nulls jsonb_subscript_handler jsonb_to_record
 syn keyword sqlFunction contained jsonb_to_recordset jsonb_to_tsvector jsonb_typeof jsonpath_in
 syn keyword sqlFunction contained jsonpath_out jsonpath_recv jsonpath_send justify_days justify_hours
 syn keyword sqlFunction contained justify_interval koi8r_to_iso koi8r_to_mic koi8r_to_utf8
-syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag
-syn keyword sqlFunction contained language_handler_in language_handler_out last_value lastval latin1_to_mic
-syn keyword sqlFunction contained latin2_to_mic latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left
-syn keyword sqlFunction contained length like like_escape likejoinsel likesel line line_distance
-syn keyword sqlFunction contained line_eq line_horizontal line_in line_interpt line_intersect
-syn keyword sqlFunction contained line_out line_parallel line_perp line_recv line_send line_vertical ln
-syn keyword sqlFunction contained lo_close lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
+syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag language_handler_in
+syn keyword sqlFunction contained language_handler_out last_value lastval latin1_to_mic latin2_to_mic
+syn keyword sqlFunction contained latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left length
+syn keyword sqlFunction contained like like_escape likejoinsel likesel line line_distance line_eq
+syn keyword sqlFunction contained line_horizontal line_in line_interpt line_intersect line_out
+syn keyword sqlFunction contained line_parallel line_perp line_recv line_send line_vertical ln lo_close
+syn keyword sqlFunction contained lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
 syn keyword sqlFunction contained lo_lseek lo_lseek64 lo_open lo_put lo_tell lo_tell64 lo_truncate
-syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf
-syn keyword sqlFunction contained lowrite lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
+syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf lowrite
+syn keyword sqlFunction contained lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
 syn keyword sqlFunction contained lseg_horizontal lseg_in lseg_interpt lseg_intersect lseg_le
-syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp
-syn keyword sqlFunction contained lseg_recv lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
-syn keyword sqlFunction contained macaddr8_cmp macaddr8_eq macaddr8_ge macaddr8_gt macaddr8_in
-syn keyword sqlFunction contained macaddr8_le macaddr8_lt macaddr8_ne macaddr8_not macaddr8_or
-syn keyword sqlFunction contained macaddr8_out macaddr8_recv macaddr8_send macaddr8_set7bit macaddr_and
+syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp lseg_recv
+syn keyword sqlFunction contained lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
+syn keyword sqlFunction contained macaddr8_cmp macaddr8_eq macaddr8_ge macaddr8_gt macaddr8_in macaddr8_le
+syn keyword sqlFunction contained macaddr8_lt macaddr8_ne macaddr8_not macaddr8_or macaddr8_out
+syn keyword sqlFunction contained macaddr8_recv macaddr8_send macaddr8_set7bit macaddr_and
 syn keyword sqlFunction contained macaddr_cmp macaddr_eq macaddr_ge macaddr_gt macaddr_in macaddr_le
-syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out
-syn keyword sqlFunction contained macaddr_recv macaddr_send macaddr_sortsupport make_date make_interval
-syn keyword sqlFunction contained make_time make_timestamp make_timestamptz makeaclitem masklen
-syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn
-syn keyword sqlFunction contained mic_to_euc_jp mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
+syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out macaddr_recv
+syn keyword sqlFunction contained macaddr_send macaddr_sortsupport make_date make_interval make_time
+syn keyword sqlFunction contained make_timestamp make_timestamptz makeaclitem masklen
+syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn mic_to_euc_jp
+syn keyword sqlFunction contained mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
 syn keyword sqlFunction contained mic_to_latin1 mic_to_latin2 mic_to_latin3 mic_to_latin4 mic_to_sjis
 syn keyword sqlFunction contained mic_to_win1250 mic_to_win1251 mic_to_win866 min min_scale mod mode
-syn keyword sqlFunction contained mode_final money mul_d_interval mxid_age name nameconcatoid nameeq
-syn keyword sqlFunction contained nameeqtext namege namegetext namegt namegttext nameiclike
-syn keyword sqlFunction contained nameicnlike nameicregexeq nameicregexne namein namele nameletext
-syn keyword sqlFunction contained namelike namelt namelttext namene namenetext namenlike nameout namerecv
-syn keyword sqlFunction contained nameregexeq nameregexne namesend neqjoinsel neqsel netmask network
-syn keyword sqlFunction contained network_cmp network_eq network_ge network_gt network_larger
-syn keyword sqlFunction contained network_le network_lt network_ne network_overlap network_smaller
-syn keyword sqlFunction contained network_sortsupport network_sub network_subeq
-syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel networksel nextval
-syn keyword sqlFunction contained nlikejoinsel nlikesel normalize notlike now npoints nth_value ntile
-syn keyword sqlFunction contained num_nonnulls num_nulls numeric numeric_abs numeric_accum
-syn keyword sqlFunction contained numeric_accum_inv numeric_add numeric_avg numeric_avg_accum
-syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize numeric_avg_serialize
-syn keyword sqlFunction contained numeric_cmp numeric_combine numeric_deserialize numeric_div
-syn keyword sqlFunction contained numeric_div_trunc numeric_eq numeric_exp numeric_fac numeric_ge numeric_gt
-syn keyword sqlFunction contained numeric_in numeric_inc numeric_larger numeric_le numeric_ln
-syn keyword sqlFunction contained numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
-syn keyword sqlFunction contained numeric_out numeric_poly_avg numeric_poly_combine
-syn keyword sqlFunction contained numeric_poly_deserialize numeric_poly_serialize numeric_poly_stddev_pop
-syn keyword sqlFunction contained numeric_poly_stddev_samp numeric_poly_sum numeric_poly_var_pop
-syn keyword sqlFunction contained numeric_poly_var_samp numeric_power numeric_recv numeric_send
-syn keyword sqlFunction contained numeric_serialize numeric_smaller numeric_sortsupport numeric_sqrt
-syn keyword sqlFunction contained numeric_stddev_pop numeric_stddev_samp numeric_sub numeric_sum
-syn keyword sqlFunction contained numeric_support numeric_uminus numeric_uplus numeric_var_pop
-syn keyword sqlFunction contained numeric_var_samp numerictypmodin numerictypmodout numnode numrange
-syn keyword sqlFunction contained numrange_subdiff obj_description octet_length oid oideq oidge oidgt oidin
-syn keyword sqlFunction contained oidlarger oidle oidlt oidne oidout oidrecv oidsend oidsmaller
-syn keyword sqlFunction contained oidvectoreq oidvectorge oidvectorgt oidvectorin oidvectorle
-syn keyword sqlFunction contained oidvectorlt oidvectorne oidvectorout oidvectorrecv oidvectorsend
-syn keyword sqlFunction contained oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl
-syn keyword sqlFunction contained ordered_set_transition ordered_set_transition_multi overlaps overlay parse_ident
-syn keyword sqlFunction contained path path_add path_add_pt path_center path_contain_pt path_distance
-syn keyword sqlFunction contained path_div_pt path_in path_inter path_length path_mul_pt path_n_eq
-syn keyword sqlFunction contained path_n_ge path_n_gt path_n_le path_n_lt path_npoints path_out
-syn keyword sqlFunction contained path_recv path_send path_sub_pt pclose percent_rank
-syn keyword sqlFunction contained percent_rank_final percentile_cont percentile_cont_float8_final
-syn keyword sqlFunction contained percentile_cont_float8_multi_final percentile_cont_interval_final
-syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc
-syn keyword sqlFunction contained percentile_disc_final percentile_disc_multi_final pg_advisory_lock
-syn keyword sqlFunction contained pg_advisory_lock_shared pg_advisory_unlock pg_advisory_unlock_all
-syn keyword sqlFunction contained pg_advisory_unlock_shared pg_advisory_xact_lock
-syn keyword sqlFunction contained pg_advisory_xact_lock_shared pg_available_extension_versions
-syn keyword sqlFunction contained pg_available_extensions pg_backend_pid pg_backup_start_time pg_blocking_pids
-syn keyword sqlFunction contained pg_cancel_backend pg_char_to_encoding pg_client_encoding
-syn keyword sqlFunction contained pg_collation_actual_version pg_collation_for pg_collation_is_visible
+syn keyword sqlFunction contained mode_final money mul_d_interval multirange
+syn keyword sqlFunction contained multirange_adjacent_multirange multirange_adjacent_range multirange_after_multirange
+syn keyword sqlFunction contained multirange_after_range multirange_before_multirange
+syn keyword sqlFunction contained multirange_before_range multirange_cmp multirange_contained_by_multirange
+syn keyword sqlFunction contained multirange_contained_by_range multirange_contains_elem
+syn keyword sqlFunction contained multirange_contains_multirange multirange_contains_range
+syn keyword sqlFunction contained multirange_eq multirange_ge multirange_gist_compress
+syn keyword sqlFunction contained multirange_gist_consistent multirange_gt multirange_in multirange_intersect
+syn keyword sqlFunction contained multirange_intersect_agg_transfn multirange_le multirange_lt
+syn keyword sqlFunction contained multirange_minus multirange_ne multirange_out
+syn keyword sqlFunction contained multirange_overlaps_multirange multirange_overlaps_range
+syn keyword sqlFunction contained multirange_overleft_multirange multirange_overleft_range multirange_overright_multirange
+syn keyword sqlFunction contained multirange_overright_range multirange_recv multirange_send
+syn keyword sqlFunction contained multirange_typanalyze multirange_union multirangesel mxid_age name
+syn keyword sqlFunction contained nameconcatoid nameeq nameeqtext namege namegetext namegt
+syn keyword sqlFunction contained namegttext nameiclike nameicnlike nameicregexeq nameicregexne namein
+syn keyword sqlFunction contained namele nameletext namelike namelt namelttext namene namenetext
+syn keyword sqlFunction contained namenlike nameout namerecv nameregexeq nameregexne namesend neqjoinsel
+syn keyword sqlFunction contained neqsel netmask network network_cmp network_eq network_ge network_gt
+syn keyword sqlFunction contained network_larger network_le network_lt network_ne network_overlap
+syn keyword sqlFunction contained network_smaller network_sortsupport network_sub network_subeq
+syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel
+syn keyword sqlFunction contained networksel nextval nlikejoinsel nlikesel normalize notlike now
+syn keyword sqlFunction contained npoints nth_value ntile num_nonnulls num_nulls numeric numeric_abs
+syn keyword sqlFunction contained numeric_accum numeric_accum_inv numeric_add numeric_avg
+syn keyword sqlFunction contained numeric_avg_accum numeric_avg_combine numeric_avg_deserialize
+syn keyword sqlFunction contained numeric_avg_serialize numeric_cmp numeric_combine numeric_deserialize
+syn keyword sqlFunction contained numeric_div numeric_div_trunc numeric_eq numeric_exp numeric_ge
+syn keyword sqlFunction contained numeric_gt numeric_in numeric_inc numeric_larger numeric_le
+syn keyword sqlFunction contained numeric_ln numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
+syn keyword sqlFunction contained numeric_out numeric_pl_pg_lsn numeric_poly_avg
+syn keyword sqlFunction contained numeric_poly_combine numeric_poly_deserialize numeric_poly_serialize
+syn keyword sqlFunction contained numeric_poly_stddev_pop numeric_poly_stddev_samp numeric_poly_sum
+syn keyword sqlFunction contained numeric_poly_var_pop numeric_poly_var_samp numeric_power numeric_recv
+syn keyword sqlFunction contained numeric_send numeric_serialize numeric_smaller
+syn keyword sqlFunction contained numeric_sortsupport numeric_sqrt numeric_stddev_pop numeric_stddev_samp
+syn keyword sqlFunction contained numeric_sub numeric_sum numeric_support numeric_uminus numeric_uplus
+syn keyword sqlFunction contained numeric_var_pop numeric_var_samp numerictypmodin
+syn keyword sqlFunction contained numerictypmodout nummultirange numnode numrange numrange_subdiff
+syn keyword sqlFunction contained obj_description octet_length oid oideq oidge oidgt oidin oidlarger oidle oidlt
+syn keyword sqlFunction contained oidne oidout oidrecv oidsend oidsmaller oidvectoreq oidvectorge
+syn keyword sqlFunction contained oidvectorgt oidvectorin oidvectorle oidvectorlt oidvectorne
+syn keyword sqlFunction contained oidvectorout oidvectorrecv oidvectorsend oidvectortypes on_pb on_pl
+syn keyword sqlFunction contained on_ppath on_ps on_sb on_sl ordered_set_transition
+syn keyword sqlFunction contained ordered_set_transition_multi overlaps overlay parse_ident path path_add path_add_pt
+syn keyword sqlFunction contained path_center path_contain_pt path_distance path_div_pt path_in
+syn keyword sqlFunction contained path_inter path_length path_mul_pt path_n_eq path_n_ge path_n_gt
+syn keyword sqlFunction contained path_n_le path_n_lt path_npoints path_out path_recv path_send
+syn keyword sqlFunction contained path_sub_pt pclose percent_rank percent_rank_final percentile_cont
+syn keyword sqlFunction contained percentile_cont_float8_final percentile_cont_float8_multi_final
+syn keyword sqlFunction contained percentile_cont_interval_final
+syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc percentile_disc_final
+syn keyword sqlFunction contained percentile_disc_multi_final pg_advisory_lock pg_advisory_lock_shared
+syn keyword sqlFunction contained pg_advisory_unlock pg_advisory_unlock_all pg_advisory_unlock_shared
+syn keyword sqlFunction contained pg_advisory_xact_lock pg_advisory_xact_lock_shared
+syn keyword sqlFunction contained pg_available_extension_versions pg_available_extensions pg_backend_pid
+syn keyword sqlFunction contained pg_backup_start_time pg_blocking_pids pg_cancel_backend
+syn keyword sqlFunction contained pg_char_to_encoding pg_client_encoding pg_collation_actual_version
+syn keyword sqlFunction contained pg_collation_for pg_collation_is_visible pg_column_compression
 syn keyword sqlFunction contained pg_column_is_updatable pg_column_size pg_conf_load_time pg_config
 syn keyword sqlFunction contained pg_control_checkpoint pg_control_init pg_control_recovery
 syn keyword sqlFunction contained pg_control_system pg_conversion_is_visible
@@ -452,15 +493,18 @@ syn keyword sqlFunction contained pg_event_trigger_dropped_objects pg_event_trig
 syn keyword sqlFunction contained pg_event_trigger_table_rewrite_reason pg_export_snapshot
 syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename
 syn keyword sqlFunction contained pg_file_sync pg_file_unlink pg_file_write pg_filenode_relation
-syn keyword sqlFunction contained pg_function_is_visible pg_get_constraintdef pg_get_expr
+syn keyword sqlFunction contained pg_function_is_visible pg_get_backend_memory_contexts
+syn keyword sqlFunction contained pg_get_catalog_foreign_keys pg_get_constraintdef pg_get_expr
 syn keyword sqlFunction contained pg_get_function_arg_default pg_get_function_arguments
-syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_functiondef
-syn keyword sqlFunction contained pg_get_indexdef pg_get_keywords pg_get_multixact_members
-syn keyword sqlFunction contained pg_get_object_address pg_get_partition_constraintdef pg_get_partkeydef
-syn keyword sqlFunction contained pg_get_publication_tables pg_get_replica_identity_index
-syn keyword sqlFunction contained pg_get_replication_slots pg_get_ruledef pg_get_serial_sequence
-syn keyword sqlFunction contained pg_get_shmem_allocations pg_get_statisticsobjdef pg_get_triggerdef
-syn keyword sqlFunction contained pg_get_userbyid pg_get_viewdef pg_has_role pg_hba_file_rules
+syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_function_sqlbody
+syn keyword sqlFunction contained pg_get_functiondef pg_get_indexdef pg_get_keywords
+syn keyword sqlFunction contained pg_get_multixact_members pg_get_object_address pg_get_partition_constraintdef
+syn keyword sqlFunction contained pg_get_partkeydef pg_get_publication_tables
+syn keyword sqlFunction contained pg_get_replica_identity_index pg_get_replication_slots pg_get_ruledef
+syn keyword sqlFunction contained pg_get_serial_sequence pg_get_shmem_allocations pg_get_statisticsobjdef
+syn keyword sqlFunction contained pg_get_statisticsobjdef_columns
+syn keyword sqlFunction contained pg_get_statisticsobjdef_expressions pg_get_triggerdef pg_get_userbyid pg_get_viewdef
+syn keyword sqlFunction contained pg_get_wal_replay_pause_state pg_has_role pg_hba_file_rules
 syn keyword sqlFunction contained pg_identify_object pg_identify_object_as_address
 syn keyword sqlFunction contained pg_import_system_collations pg_index_column_has_property pg_index_has_property
 syn keyword sqlFunction contained pg_indexam_has_property pg_indexam_progress_phasename
@@ -468,25 +512,26 @@ syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recov
 syn keyword sqlFunction contained pg_is_other_temp_schema pg_is_wal_replay_paused
 syn keyword sqlFunction contained pg_isolation_test_session_is_blocked pg_jit_available pg_last_committed_xact
 syn keyword sqlFunction contained pg_last_wal_receive_lsn pg_last_wal_replay_lsn pg_last_xact_replay_timestamp
-syn keyword sqlFunction contained pg_listening_channels pg_lock_status pg_logdir_ls
-syn keyword sqlFunction contained pg_logical_emit_message pg_logical_slot_get_binary_changes
-syn keyword sqlFunction contained pg_logical_slot_get_changes pg_logical_slot_peek_binary_changes
-syn keyword sqlFunction contained pg_logical_slot_peek_changes pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir
-syn keyword sqlFunction contained pg_ls_tmpdir pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge
-syn keyword sqlFunction contained pg_lsn_gt pg_lsn_hash pg_lsn_hash_extended pg_lsn_in pg_lsn_larger
-syn keyword sqlFunction contained pg_lsn_le pg_lsn_lt pg_lsn_mi pg_lsn_ne pg_lsn_out pg_lsn_recv
-syn keyword sqlFunction contained pg_lsn_send pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items
-syn keyword sqlFunction contained pg_mcv_list_out pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
-syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv
-syn keyword sqlFunction contained pg_ndistinct_send pg_nextoid pg_node_tree_in pg_node_tree_out
-syn keyword sqlFunction contained pg_node_tree_recv pg_node_tree_send pg_notification_queue_usage pg_notify
-syn keyword sqlFunction contained pg_opclass_is_visible pg_operator_is_visible
-syn keyword sqlFunction contained pg_opfamily_is_visible pg_options_to_table pg_partition_ancestors pg_partition_root
-syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time
-syn keyword sqlFunction contained pg_prepared_statement pg_prepared_xact pg_promote pg_read_binary_file
-syn keyword sqlFunction contained pg_read_file pg_read_file_old pg_relation_filenode pg_relation_filepath
-syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable
-syn keyword sqlFunction contained pg_relation_size pg_reload_conf pg_replication_origin_advance
+syn keyword sqlFunction contained pg_listening_channels pg_lock_status
+syn keyword sqlFunction contained pg_log_backend_memory_contexts pg_logdir_ls pg_logical_emit_message
+syn keyword sqlFunction contained pg_logical_slot_get_binary_changes pg_logical_slot_get_changes
+syn keyword sqlFunction contained pg_logical_slot_peek_binary_changes pg_logical_slot_peek_changes
+syn keyword sqlFunction contained pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir pg_ls_tmpdir pg_ls_waldir pg_lsn
+syn keyword sqlFunction contained pg_lsn_cmp pg_lsn_eq pg_lsn_ge pg_lsn_gt pg_lsn_hash
+syn keyword sqlFunction contained pg_lsn_hash_extended pg_lsn_in pg_lsn_larger pg_lsn_le pg_lsn_lt pg_lsn_mi
+syn keyword sqlFunction contained pg_lsn_mii pg_lsn_ne pg_lsn_out pg_lsn_pli pg_lsn_recv pg_lsn_send
+syn keyword sqlFunction contained pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items pg_mcv_list_out
+syn keyword sqlFunction contained pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
+syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv pg_ndistinct_send
+syn keyword sqlFunction contained pg_nextoid pg_node_tree_in pg_node_tree_out pg_node_tree_recv
+syn keyword sqlFunction contained pg_node_tree_send pg_notification_queue_usage pg_notify
+syn keyword sqlFunction contained pg_opclass_is_visible pg_operator_is_visible pg_opfamily_is_visible
+syn keyword sqlFunction contained pg_options_to_table pg_partition_ancestors pg_partition_root
+syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time pg_prepared_statement
+syn keyword sqlFunction contained pg_prepared_xact pg_promote pg_read_binary_file pg_read_file
+syn keyword sqlFunction contained pg_read_file_old pg_relation_filenode pg_relation_filepath
+syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable pg_relation_size
+syn keyword sqlFunction contained pg_reload_conf pg_replication_origin_advance
 syn keyword sqlFunction contained pg_replication_origin_create pg_replication_origin_drop
 syn keyword sqlFunction contained pg_replication_origin_oid pg_replication_origin_progress
 syn keyword sqlFunction contained pg_replication_origin_session_is_setup pg_replication_origin_session_progress
@@ -498,8 +543,8 @@ syn keyword sqlFunction contained pg_sequence_last_value pg_sequence_parameters
 syn keyword sqlFunction contained pg_show_all_settings pg_show_replication_origin_status
 syn keyword sqlFunction contained pg_size_bytes pg_size_pretty pg_sleep pg_sleep_for pg_sleep_until
 syn keyword sqlFunction contained pg_snapshot_in pg_snapshot_out pg_snapshot_recv pg_snapshot_send
-syn keyword sqlFunction contained pg_snapshot_xip pg_snapshot_xmax pg_snapshot_xmin
-syn keyword sqlFunction contained pg_start_backup pg_stat_clear_snapshot pg_stat_file pg_stat_get_activity
+syn keyword sqlFunction contained pg_snapshot_xip pg_snapshot_xmax pg_snapshot_xmin pg_start_backup
+syn keyword sqlFunction contained pg_stat_clear_snapshot pg_stat_file pg_stat_get_activity
 syn keyword sqlFunction contained pg_stat_get_analyze_count pg_stat_get_archiver
 syn keyword sqlFunction contained pg_stat_get_autoanalyze_count pg_stat_get_autovacuum_count
 syn keyword sqlFunction contained pg_stat_get_backend_activity pg_stat_get_backend_activity_start
@@ -512,205 +557,216 @@ syn keyword sqlFunction contained pg_stat_get_bgwriter_buf_written_checkpoints p
 syn keyword sqlFunction contained pg_stat_get_bgwriter_maxwritten_clean
 syn keyword sqlFunction contained pg_stat_get_bgwriter_requested_checkpoints pg_stat_get_bgwriter_stat_reset_time
 syn keyword sqlFunction contained pg_stat_get_bgwriter_timed_checkpoints pg_stat_get_blocks_fetched
-syn keyword sqlFunction contained pg_stat_get_blocks_hit pg_stat_get_buf_alloc
-syn keyword sqlFunction contained pg_stat_get_buf_fsync_backend pg_stat_get_buf_written_backend
+syn keyword sqlFunction contained pg_stat_get_blocks_hit pg_stat_get_buf_alloc pg_stat_get_buf_fsync_backend
+syn keyword sqlFunction contained pg_stat_get_buf_written_backend
 syn keyword sqlFunction contained pg_stat_get_checkpoint_sync_time pg_stat_get_checkpoint_write_time
-syn keyword sqlFunction contained pg_stat_get_db_blk_read_time pg_stat_get_db_blk_write_time
-syn keyword sqlFunction contained pg_stat_get_db_blocks_fetched pg_stat_get_db_blocks_hit
-syn keyword sqlFunction contained pg_stat_get_db_checksum_failures pg_stat_get_db_checksum_last_failure
-syn keyword sqlFunction contained pg_stat_get_db_conflict_all pg_stat_get_db_conflict_bufferpin
-syn keyword sqlFunction contained pg_stat_get_db_conflict_lock pg_stat_get_db_conflict_snapshot
-syn keyword sqlFunction contained pg_stat_get_db_conflict_startup_deadlock
-syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks pg_stat_get_db_numbackends
-syn keyword sqlFunction contained pg_stat_get_db_stat_reset_time pg_stat_get_db_temp_bytes
-syn keyword sqlFunction contained pg_stat_get_db_temp_files pg_stat_get_db_tuples_deleted
-syn keyword sqlFunction contained pg_stat_get_db_tuples_fetched pg_stat_get_db_tuples_inserted
-syn keyword sqlFunction contained pg_stat_get_db_tuples_returned pg_stat_get_db_tuples_updated
-syn keyword sqlFunction contained pg_stat_get_db_xact_commit pg_stat_get_db_xact_rollback
-syn keyword sqlFunction contained pg_stat_get_dead_tuples pg_stat_get_function_calls pg_stat_get_function_self_time
-syn keyword sqlFunction contained pg_stat_get_function_total_time pg_stat_get_ins_since_vacuum
-syn keyword sqlFunction contained pg_stat_get_last_analyze_time
+syn keyword sqlFunction contained pg_stat_get_db_active_time pg_stat_get_db_blk_read_time
+syn keyword sqlFunction contained pg_stat_get_db_blk_write_time pg_stat_get_db_blocks_fetched pg_stat_get_db_blocks_hit
+syn keyword sqlFunction contained pg_stat_get_db_checksum_failures
+syn keyword sqlFunction contained pg_stat_get_db_checksum_last_failure pg_stat_get_db_conflict_all
+syn keyword sqlFunction contained pg_stat_get_db_conflict_bufferpin pg_stat_get_db_conflict_lock
+syn keyword sqlFunction contained pg_stat_get_db_conflict_snapshot pg_stat_get_db_conflict_startup_deadlock
+syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks
+syn keyword sqlFunction contained pg_stat_get_db_idle_in_transaction_time pg_stat_get_db_numbackends
+syn keyword sqlFunction contained pg_stat_get_db_session_time pg_stat_get_db_sessions
+syn keyword sqlFunction contained pg_stat_get_db_sessions_abandoned pg_stat_get_db_sessions_fatal
+syn keyword sqlFunction contained pg_stat_get_db_sessions_killed pg_stat_get_db_stat_reset_time
+syn keyword sqlFunction contained pg_stat_get_db_temp_bytes pg_stat_get_db_temp_files
+syn keyword sqlFunction contained pg_stat_get_db_tuples_deleted pg_stat_get_db_tuples_fetched
+syn keyword sqlFunction contained pg_stat_get_db_tuples_inserted pg_stat_get_db_tuples_returned
+syn keyword sqlFunction contained pg_stat_get_db_tuples_updated pg_stat_get_db_xact_commit
+syn keyword sqlFunction contained pg_stat_get_db_xact_rollback pg_stat_get_dead_tuples pg_stat_get_function_calls
+syn keyword sqlFunction contained pg_stat_get_function_self_time pg_stat_get_function_total_time
+syn keyword sqlFunction contained pg_stat_get_ins_since_vacuum pg_stat_get_last_analyze_time
 syn keyword sqlFunction contained pg_stat_get_last_autoanalyze_time pg_stat_get_last_autovacuum_time
-syn keyword sqlFunction contained pg_stat_get_last_vacuum_time pg_stat_get_live_tuples pg_stat_get_mod_since_analyze
-syn keyword sqlFunction contained pg_stat_get_numscans pg_stat_get_progress_info pg_stat_get_slru
+syn keyword sqlFunction contained pg_stat_get_last_vacuum_time pg_stat_get_live_tuples
+syn keyword sqlFunction contained pg_stat_get_mod_since_analyze pg_stat_get_numscans
+syn keyword sqlFunction contained pg_stat_get_progress_info pg_stat_get_replication_slot pg_stat_get_slru
 syn keyword sqlFunction contained pg_stat_get_snapshot_timestamp pg_stat_get_subscription
 syn keyword sqlFunction contained pg_stat_get_tuples_deleted pg_stat_get_tuples_fetched
 syn keyword sqlFunction contained pg_stat_get_tuples_hot_updated pg_stat_get_tuples_inserted
-syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated
-syn keyword sqlFunction contained pg_stat_get_vacuum_count pg_stat_get_wal_receiver pg_stat_get_wal_senders
+syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated pg_stat_get_vacuum_count
+syn keyword sqlFunction contained pg_stat_get_wal pg_stat_get_wal_receiver pg_stat_get_wal_senders
 syn keyword sqlFunction contained pg_stat_get_xact_blocks_fetched pg_stat_get_xact_blocks_hit
-syn keyword sqlFunction contained pg_stat_get_xact_function_calls pg_stat_get_xact_function_self_time
-syn keyword sqlFunction contained pg_stat_get_xact_function_total_time pg_stat_get_xact_numscans
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted
+syn keyword sqlFunction contained pg_stat_get_xact_function_calls
+syn keyword sqlFunction contained pg_stat_get_xact_function_self_time pg_stat_get_xact_function_total_time
+syn keyword sqlFunction contained pg_stat_get_xact_numscans pg_stat_get_xact_tuples_deleted
 syn keyword sqlFunction contained pg_stat_get_xact_tuples_fetched pg_stat_get_xact_tuples_hot_updated
 syn keyword sqlFunction contained pg_stat_get_xact_tuples_inserted pg_stat_get_xact_tuples_returned
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset pg_stat_reset_shared
-syn keyword sqlFunction contained pg_stat_reset_single_function_counters
-syn keyword sqlFunction contained pg_stat_reset_single_table_counters pg_stat_reset_slru pg_statistics_obj_is_visible
-syn keyword sqlFunction contained pg_stop_backup pg_switch_wal pg_table_is_visible pg_table_size
-syn keyword sqlFunction contained pg_tablespace_databases pg_tablespace_location pg_tablespace_size
-syn keyword sqlFunction contained pg_terminate_backend pg_timezone_abbrevs pg_timezone_names
-syn keyword sqlFunction contained pg_total_relation_size pg_trigger_depth pg_try_advisory_lock
-syn keyword sqlFunction contained pg_try_advisory_lock_shared pg_try_advisory_xact_lock
-syn keyword sqlFunction contained pg_try_advisory_xact_lock_shared pg_ts_config_is_visible pg_ts_dict_is_visible
-syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visible
-syn keyword sqlFunction contained pg_type_is_visible pg_typeof pg_visible_in_snapshot pg_wal_lsn_diff
-syn keyword sqlFunction contained pg_wal_replay_pause pg_wal_replay_resume pg_walfile_name
-syn keyword sqlFunction contained pg_walfile_name_offset pg_xact_commit_timestamp pg_xact_status
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset
+syn keyword sqlFunction contained pg_stat_reset_replication_slot pg_stat_reset_shared
+syn keyword sqlFunction contained pg_stat_reset_single_function_counters pg_stat_reset_single_table_counters pg_stat_reset_slru
+syn keyword sqlFunction contained pg_statistics_obj_is_visible pg_stop_backup pg_switch_wal
+syn keyword sqlFunction contained pg_table_is_visible pg_table_size pg_tablespace_databases
+syn keyword sqlFunction contained pg_tablespace_location pg_tablespace_size pg_terminate_backend
+syn keyword sqlFunction contained pg_timezone_abbrevs pg_timezone_names pg_total_relation_size
+syn keyword sqlFunction contained pg_trigger_depth pg_try_advisory_lock pg_try_advisory_lock_shared
+syn keyword sqlFunction contained pg_try_advisory_xact_lock pg_try_advisory_xact_lock_shared
+syn keyword sqlFunction contained pg_ts_config_is_visible pg_ts_dict_is_visible
+syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visible pg_type_is_visible pg_typeof
+syn keyword sqlFunction contained pg_visible_in_snapshot pg_wal_lsn_diff pg_wal_replay_pause
+syn keyword sqlFunction contained pg_wal_replay_resume pg_walfile_name pg_walfile_name_offset
+syn keyword sqlFunction contained pg_xact_commit_timestamp pg_xact_commit_timestamp_origin pg_xact_status
 syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler
 syn keyword sqlFunction contained plperl_inline_handler plperl_validator plperlu_call_handler
 syn keyword sqlFunction contained plperlu_inline_handler plperlu_validator plpgsql_call_handler
-syn keyword sqlFunction contained plpgsql_inline_handler plpgsql_validator pltcl_call_handler pltclu_call_handler
-syn keyword sqlFunction contained point point_above point_add point_below point_distance point_div
-syn keyword sqlFunction contained point_eq point_horiz point_in point_left point_mul point_ne
-syn keyword sqlFunction contained point_out point_recv point_right point_send point_sub point_vert
-syn keyword sqlFunction contained poly_above poly_below poly_center poly_contain poly_contain_pt
-syn keyword sqlFunction contained poly_contained poly_distance poly_in poly_left poly_npoints poly_out
-syn keyword sqlFunction contained poly_overabove poly_overbelow poly_overlap poly_overleft
-syn keyword sqlFunction contained poly_overright poly_recv poly_right poly_same poly_send polygon popen
-syn keyword sqlFunction contained position positionjoinsel positionsel postgresql_fdw_validator pow power
-syn keyword sqlFunction contained prefixjoinsel prefixsel prsd_end prsd_headline prsd_lextype
-syn keyword sqlFunction contained prsd_nexttoken prsd_start pt_contained_circle pt_contained_poly
-syn keyword sqlFunction contained query_to_xml query_to_xml_and_xmlschema query_to_xmlschema
-syn keyword sqlFunction contained querytree quote_ident quote_literal quote_nullable radians radius
-syn keyword sqlFunction contained random range_adjacent range_after range_before range_cmp
-syn keyword sqlFunction contained range_contained_by range_contains range_contains_elem range_eq range_ge
+syn keyword sqlFunction contained plpgsql_inline_handler plpgsql_validator pltcl_call_handler
+syn keyword sqlFunction contained pltclu_call_handler point point_above point_add point_below point_distance
+syn keyword sqlFunction contained point_div point_eq point_horiz point_in point_left point_mul
+syn keyword sqlFunction contained point_ne point_out point_recv point_right point_send point_sub
+syn keyword sqlFunction contained point_vert poly_above poly_below poly_center poly_contain
+syn keyword sqlFunction contained poly_contain_pt poly_contained poly_distance poly_in poly_left poly_npoints
+syn keyword sqlFunction contained poly_out poly_overabove poly_overbelow poly_overlap poly_overleft
+syn keyword sqlFunction contained poly_overright poly_recv poly_right poly_same poly_send polygon
+syn keyword sqlFunction contained popen position positionjoinsel positionsel
+syn keyword sqlFunction contained postgresql_fdw_validator pow power prefixjoinsel prefixsel prsd_end prsd_headline
+syn keyword sqlFunction contained prsd_lextype prsd_nexttoken prsd_start pt_contained_circle
+syn keyword sqlFunction contained pt_contained_poly query_to_xml query_to_xml_and_xmlschema
+syn keyword sqlFunction contained query_to_xmlschema querytree quote_ident quote_literal quote_nullable radians
+syn keyword sqlFunction contained radius random range_adjacent range_adjacent_multirange
+syn keyword sqlFunction contained range_after range_after_multirange range_agg range_agg_finalfn
+syn keyword sqlFunction contained range_agg_transfn range_before range_before_multirange range_cmp
+syn keyword sqlFunction contained range_contained_by range_contained_by_multirange range_contains
+syn keyword sqlFunction contained range_contains_elem range_contains_multirange range_eq range_ge
 syn keyword sqlFunction contained range_gist_consistent range_gist_penalty range_gist_picksplit
 syn keyword sqlFunction contained range_gist_same range_gist_union range_gt range_in range_intersect
-syn keyword sqlFunction contained range_le range_lt range_merge range_minus range_ne range_out
-syn keyword sqlFunction contained range_overlaps range_overleft range_overright range_recv range_send
-syn keyword sqlFunction contained range_typanalyze range_union rangesel rank rank_final record_eq
-syn keyword sqlFunction contained record_ge record_gt record_image_eq record_image_ge
-syn keyword sqlFunction contained record_image_gt record_image_le record_image_lt record_image_ne record_in
-syn keyword sqlFunction contained record_le record_lt record_ne record_out record_recv record_send
-syn keyword sqlFunction contained regclass regclassin regclassout regclassrecv regclasssend
-syn keyword sqlFunction contained regcollationin regcollationout regcollationrecv regcollationsend
-syn keyword sqlFunction contained regconfigin regconfigout regconfigrecv regconfigsend regdictionaryin
-syn keyword sqlFunction contained regdictionaryout regdictionaryrecv regdictionarysend
-syn keyword sqlFunction contained regexeqjoinsel regexeqsel regexnejoinsel regexnesel regexp_match
-syn keyword sqlFunction contained regexp_matches regexp_replace regexp_split_to_array
-syn keyword sqlFunction contained regexp_split_to_table regnamespacein regnamespaceout regnamespacerecv
-syn keyword sqlFunction contained regnamespacesend regoperatorin regoperatorout regoperatorrecv
-syn keyword sqlFunction contained regoperatorsend regoperin regoperout regoperrecv regopersend regprocedurein
-syn keyword sqlFunction contained regprocedureout regprocedurerecv regproceduresend regprocin
-syn keyword sqlFunction contained regprocout regprocrecv regprocsend regr_avgx regr_avgy regr_count
-syn keyword sqlFunction contained regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy regrolein
-syn keyword sqlFunction contained regroleout regrolerecv regrolesend regtypein regtypeout
-syn keyword sqlFunction contained regtyperecv regtypesend repeat replace reverse right round row_number
-syn keyword sqlFunction contained row_security_active row_to_json rpad rtrim satisfies_hash_partition
-syn keyword sqlFunction contained scalargejoinsel scalargesel scalargtjoinsel scalargtsel
-syn keyword sqlFunction contained scalarlejoinsel scalarlesel scalarltjoinsel scalarltsel scale
-syn keyword sqlFunction contained schema_to_xml schema_to_xml_and_xmlschema schema_to_xmlschema
-syn keyword sqlFunction contained session_user set_bit set_byte set_config set_masklen setseed setval
-syn keyword sqlFunction contained setweight sha224 sha256 sha384 sha512 shell_in shell_out
-syn keyword sqlFunction contained shift_jis_2004_to_euc_jis_2004 shift_jis_2004_to_utf8 shobj_description sign
-syn keyword sqlFunction contained similar_escape similar_to_escape sin sind sinh sjis_to_euc_jp
-syn keyword sqlFunction contained sjis_to_mic sjis_to_utf8 slope spg_bbox_quad_config
-syn keyword sqlFunction contained spg_box_quad_choose spg_box_quad_config spg_box_quad_inner_consistent
-syn keyword sqlFunction contained spg_box_quad_leaf_consistent spg_box_quad_picksplit spg_kd_choose
-syn keyword sqlFunction contained spg_kd_config spg_kd_inner_consistent spg_kd_picksplit
-syn keyword sqlFunction contained spg_poly_quad_compress spg_quad_choose spg_quad_config
-syn keyword sqlFunction contained spg_quad_inner_consistent spg_quad_leaf_consistent spg_quad_picksplit
-syn keyword sqlFunction contained spg_range_quad_choose spg_range_quad_config
-syn keyword sqlFunction contained spg_range_quad_inner_consistent spg_range_quad_leaf_consistent spg_range_quad_picksplit
-syn keyword sqlFunction contained spg_text_choose spg_text_config spg_text_inner_consistent
-syn keyword sqlFunction contained spg_text_leaf_consistent spg_text_picksplit spghandler split_part
-syn keyword sqlFunction contained sqrt starts_with statement_timestamp stddev stddev_pop stddev_samp
-syn keyword sqlFunction contained string_agg string_agg_finalfn string_agg_transfn
-syn keyword sqlFunction contained string_to_array strip strpos substr substring sum
-syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in table_am_handler_out
-syn keyword sqlFunction contained table_to_xml table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh
-syn keyword sqlFunction contained text text_ge text_gt text_larger text_le text_lt text_pattern_ge
-syn keyword sqlFunction contained text_pattern_gt text_pattern_le text_pattern_lt text_smaller
-syn keyword sqlFunction contained textanycat textcat texteq texteqname textgename textgtname texticlike
-syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq
-syn keyword sqlFunction contained texticregexeq_support texticregexne textin textlen textlename textlike
-syn keyword sqlFunction contained textlike_support textltname textne textnename textnlike textout textrecv
-syn keyword sqlFunction contained textregexeq textregexeq_support textregexne textsend thesaurus_init
-syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt
-syn keyword sqlFunction contained tidne tidout tidrecv tidsend tidsmaller time time_cmp time_eq time_ge
-syn keyword sqlFunction contained time_gt time_hash time_hash_extended time_in time_larger time_le
-syn keyword sqlFunction contained time_lt time_mi_interval time_mi_time time_ne time_out
-syn keyword sqlFunction contained time_pl_interval time_recv time_send time_smaller time_support timedate_pl
-syn keyword sqlFunction contained timeofday timestamp timestamp_cmp timestamp_cmp_date
-syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date
-syn keyword sqlFunction contained timestamp_eq_timestamptz timestamp_ge timestamp_ge_date
-syn keyword sqlFunction contained timestamp_ge_timestamptz timestamp_gt timestamp_gt_date timestamp_gt_timestamptz
-syn keyword sqlFunction contained timestamp_hash timestamp_hash_extended timestamp_in
-syn keyword sqlFunction contained timestamp_larger timestamp_le timestamp_le_date timestamp_le_timestamptz
-syn keyword sqlFunction contained timestamp_lt timestamp_lt_date timestamp_lt_timestamptz
-syn keyword sqlFunction contained timestamp_mi timestamp_mi_interval timestamp_ne timestamp_ne_date
-syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval
-syn keyword sqlFunction contained timestamp_recv timestamp_send timestamp_smaller timestamp_sortsupport
-syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout
-syn keyword sqlFunction contained timestamptz timestamptz_cmp timestamptz_cmp_date
-syn keyword sqlFunction contained timestamptz_cmp_timestamp timestamptz_eq timestamptz_eq_date
-syn keyword sqlFunction contained timestamptz_eq_timestamp timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
-syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp
-syn keyword sqlFunction contained timestamptz_in timestamptz_larger timestamptz_le
-syn keyword sqlFunction contained timestamptz_le_date timestamptz_le_timestamp timestamptz_lt
-syn keyword sqlFunction contained timestamptz_lt_date timestamptz_lt_timestamp timestamptz_mi
-syn keyword sqlFunction contained timestamptz_mi_interval timestamptz_ne timestamptz_ne_date
-syn keyword sqlFunction contained timestamptz_ne_timestamp timestamptz_out timestamptz_pl_interval timestamptz_recv
-syn keyword sqlFunction contained timestamptz_send timestamptz_smaller timestamptztypmodin
-syn keyword sqlFunction contained timestamptztypmodout timetypmodin timetypmodout timetz timetz_cmp
-syn keyword sqlFunction contained timetz_eq timetz_ge timetz_gt timetz_hash timetz_hash_extended
-syn keyword sqlFunction contained timetz_in timetz_larger timetz_le timetz_lt timetz_mi_interval
-syn keyword sqlFunction contained timetz_ne timetz_out timetz_pl_interval timetz_recv timetz_send
-syn keyword sqlFunction contained timetz_smaller timetzdate_pl timetztypmodin timetztypmodout timezone
-syn keyword sqlFunction contained to_ascii to_char to_date to_hex to_json to_jsonb to_number
-syn keyword sqlFunction contained to_regclass to_regcollation to_regnamespace to_regoper to_regoperator
-syn keyword sqlFunction contained to_regproc to_regprocedure to_regrole to_regtype to_timestamp
-syn keyword sqlFunction contained to_tsquery to_tsvector transaction_timestamp translate trigger_in
-syn keyword sqlFunction contained trigger_out trim_scale trunc ts_debug ts_delete ts_filter ts_headline
-syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq
-syn keyword sqlFunction contained ts_parse ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type
-syn keyword sqlFunction contained ts_typanalyze tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
-syn keyword sqlFunction contained tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp tsquery_eq
-syn keyword sqlFunction contained tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne tsquery_not
-syn keyword sqlFunction contained tsquery_or tsquery_phrase tsqueryin tsqueryout tsqueryrecv
-syn keyword sqlFunction contained tsquerysend tsrange tsrange_subdiff tstzrange tstzrange_subdiff
-syn keyword sqlFunction contained tsvector_cmp tsvector_concat tsvector_eq tsvector_ge tsvector_gt
-syn keyword sqlFunction contained tsvector_le tsvector_lt tsvector_ne tsvector_to_array
-syn keyword sqlFunction contained tsvector_update_trigger tsvector_update_trigger_column tsvectorin
-syn keyword sqlFunction contained tsvectorout tsvectorrecv tsvectorsend txid_current
-syn keyword sqlFunction contained txid_current_if_assigned txid_current_snapshot txid_snapshot_in txid_snapshot_out
-syn keyword sqlFunction contained txid_snapshot_recv txid_snapshot_send txid_snapshot_xip
-syn keyword sqlFunction contained txid_snapshot_xmax txid_snapshot_xmin txid_status
-syn keyword sqlFunction contained txid_visible_in_snapshot uhc_to_utf8 unique_key_recheck unknownin unknownout
-syn keyword sqlFunction contained unknownrecv unknownsend unnest upper upper_inc upper_inf utf8_to_big5
-syn keyword sqlFunction contained utf8_to_euc_cn utf8_to_euc_jis_2004 utf8_to_euc_jp utf8_to_euc_kr
-syn keyword sqlFunction contained utf8_to_euc_tw utf8_to_gb18030 utf8_to_gbk utf8_to_iso8859
-syn keyword sqlFunction contained utf8_to_iso8859_1 utf8_to_johab utf8_to_koi8r utf8_to_koi8u
-syn keyword sqlFunction contained utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc utf8_to_win uuid_cmp
-syn keyword sqlFunction contained uuid_eq uuid_ge uuid_gt uuid_hash uuid_hash_extended uuid_in uuid_le
-syn keyword sqlFunction contained uuid_lt uuid_ne uuid_out uuid_recv uuid_send uuid_sortsupport
-syn keyword sqlFunction contained var_pop var_samp varbit varbit_in varbit_out varbit_recv varbit_send
-syn keyword sqlFunction contained varbit_support varbitcmp varbiteq varbitge varbitgt varbitle
-syn keyword sqlFunction contained varbitlt varbitne varbittypmodin varbittypmodout varchar
-syn keyword sqlFunction contained varchar_support varcharin varcharout varcharrecv varcharsend
-syn keyword sqlFunction contained varchartypmodin varchartypmodout variance version void_in void_out void_recv
-syn keyword sqlFunction contained void_send websearch_to_tsquery width width_bucket
-syn keyword sqlFunction contained win1250_to_latin2 win1250_to_mic win1251_to_iso win1251_to_koi8r win1251_to_mic
-syn keyword sqlFunction contained win1251_to_win866 win866_to_iso win866_to_koi8r win866_to_mic
-syn keyword sqlFunction contained win866_to_win1251 win_to_utf8 xid xid8cmp xid8eq xid8ge xid8gt
-syn keyword sqlFunction contained xid8in xid8le xid8lt xid8ne xid8out xid8recv xid8send xideq xideqint4
-syn keyword sqlFunction contained xidin xidneq xidneqint4 xidout xidrecv xidsend xml xml_in
-syn keyword sqlFunction contained xml_is_well_formed xml_is_well_formed_content
-syn keyword sqlFunction contained xml_is_well_formed_document xml_out xml_recv xml_send xmlagg xmlcomment xmlconcat2 xmlexists
-syn keyword sqlFunction contained xmlvalidate xpath xpath_exists
+syn keyword sqlFunction contained range_intersect_agg range_intersect_agg_transfn range_le
+syn keyword sqlFunction contained range_lt range_merge range_minus range_ne range_out range_overlaps
+syn keyword sqlFunction contained range_overlaps_multirange range_overleft
+syn keyword sqlFunction contained range_overleft_multirange range_overright range_overright_multirange range_recv
+syn keyword sqlFunction contained range_send range_typanalyze range_union rangesel rank rank_final
+syn keyword sqlFunction contained raw_array_subscript_handler record_eq record_ge record_gt
+syn keyword sqlFunction contained record_image_eq record_image_ge record_image_gt record_image_le
+syn keyword sqlFunction contained record_image_lt record_image_ne record_in record_le record_lt record_ne
+syn keyword sqlFunction contained record_out record_recv record_send regclass regclassin regclassout
+syn keyword sqlFunction contained regclassrecv regclasssend regcollationin regcollationout
+syn keyword sqlFunction contained regcollationrecv regcollationsend regconfigin regconfigout
+syn keyword sqlFunction contained regconfigrecv regconfigsend regdictionaryin regdictionaryout
+syn keyword sqlFunction contained regdictionaryrecv regdictionarysend regexeqjoinsel regexeqsel regexnejoinsel
+syn keyword sqlFunction contained regexnesel regexp_match regexp_matches regexp_replace
+syn keyword sqlFunction contained regexp_split_to_array regexp_split_to_table regnamespacein
+syn keyword sqlFunction contained regnamespaceout regnamespacerecv regnamespacesend regoperatorin
+syn keyword sqlFunction contained regoperatorout regoperatorrecv regoperatorsend regoperin regoperout
+syn keyword sqlFunction contained regoperrecv regopersend regprocedurein regprocedureout regprocedurerecv
+syn keyword sqlFunction contained regproceduresend regprocin regprocout regprocrecv regprocsend
+syn keyword sqlFunction contained regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope
+syn keyword sqlFunction contained regr_sxx regr_sxy regr_syy regrolein regroleout regrolerecv
+syn keyword sqlFunction contained regrolesend regtypein regtypeout regtyperecv regtypesend repeat replace
+syn keyword sqlFunction contained reverse right round row_number row_security_active row_to_json
+syn keyword sqlFunction contained rpad rtrim satisfies_hash_partition scalargejoinsel scalargesel
+syn keyword sqlFunction contained scalargtjoinsel scalargtsel scalarlejoinsel scalarlesel
+syn keyword sqlFunction contained scalarltjoinsel scalarltsel scale schema_to_xml
+syn keyword sqlFunction contained schema_to_xml_and_xmlschema schema_to_xmlschema session_user set_bit set_byte set_config
+syn keyword sqlFunction contained set_masklen setseed setval setweight sha224 sha256 sha384 sha512
+syn keyword sqlFunction contained shell_in shell_out shift_jis_2004_to_euc_jis_2004
+syn keyword sqlFunction contained shift_jis_2004_to_utf8 shobj_description sign similar_escape similar_to_escape
+syn keyword sqlFunction contained sin sind sinh sjis_to_euc_jp sjis_to_mic sjis_to_utf8 slope
+syn keyword sqlFunction contained spg_bbox_quad_config spg_box_quad_choose spg_box_quad_config
+syn keyword sqlFunction contained spg_box_quad_inner_consistent spg_box_quad_leaf_consistent
+syn keyword sqlFunction contained spg_box_quad_picksplit spg_kd_choose spg_kd_config
+syn keyword sqlFunction contained spg_kd_inner_consistent spg_kd_picksplit spg_poly_quad_compress spg_quad_choose
+syn keyword sqlFunction contained spg_quad_config spg_quad_inner_consistent
+syn keyword sqlFunction contained spg_quad_leaf_consistent spg_quad_picksplit spg_range_quad_choose
+syn keyword sqlFunction contained spg_range_quad_config spg_range_quad_inner_consistent
+syn keyword sqlFunction contained spg_range_quad_leaf_consistent spg_range_quad_picksplit spg_text_choose spg_text_config
+syn keyword sqlFunction contained spg_text_inner_consistent spg_text_leaf_consistent
+syn keyword sqlFunction contained spg_text_picksplit spghandler split_part sqrt starts_with
+syn keyword sqlFunction contained statement_timestamp stddev stddev_pop stddev_samp string_agg string_agg_finalfn
+syn keyword sqlFunction contained string_agg_transfn string_to_array string_to_table strip strpos
+syn keyword sqlFunction contained substr substring sum suppress_redundant_updates_trigger system
+syn keyword sqlFunction contained table_am_handler_in table_am_handler_out table_to_xml
+syn keyword sqlFunction contained table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh text text_ge
+syn keyword sqlFunction contained text_gt text_larger text_le text_lt text_pattern_ge text_pattern_gt
+syn keyword sqlFunction contained text_pattern_le text_pattern_lt text_smaller textanycat textcat
+syn keyword sqlFunction contained texteq texteqname textgename textgtname texticlike
+syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq texticregexeq_support
+syn keyword sqlFunction contained texticregexne textin textlen textlename textlike textlike_support
+syn keyword sqlFunction contained textltname textne textnename textnlike textout textrecv textregexeq
+syn keyword sqlFunction contained textregexeq_support textregexne textsend thesaurus_init
+syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt tidne tidout
+syn keyword sqlFunction contained tidrecv tidsend tidsmaller time time_cmp time_eq time_ge time_gt
+syn keyword sqlFunction contained time_hash time_hash_extended time_in time_larger time_le time_lt
+syn keyword sqlFunction contained time_mi_interval time_mi_time time_ne time_out time_pl_interval
+syn keyword sqlFunction contained time_recv time_send time_smaller time_support timedate_pl timeofday
+syn keyword sqlFunction contained timestamp timestamp_cmp timestamp_cmp_date
+syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date timestamp_eq_timestamptz
+syn keyword sqlFunction contained timestamp_ge timestamp_ge_date timestamp_ge_timestamptz
+syn keyword sqlFunction contained timestamp_gt timestamp_gt_date timestamp_gt_timestamptz timestamp_hash
+syn keyword sqlFunction contained timestamp_hash_extended timestamp_in timestamp_larger
+syn keyword sqlFunction contained timestamp_le timestamp_le_date timestamp_le_timestamptz timestamp_lt
+syn keyword sqlFunction contained timestamp_lt_date timestamp_lt_timestamptz timestamp_mi
+syn keyword sqlFunction contained timestamp_mi_interval timestamp_ne timestamp_ne_date
+syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval timestamp_recv
+syn keyword sqlFunction contained timestamp_send timestamp_smaller timestamp_sortsupport
+syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout timestamptz
+syn keyword sqlFunction contained timestamptz_cmp timestamptz_cmp_date timestamptz_cmp_timestamp
+syn keyword sqlFunction contained timestamptz_eq timestamptz_eq_date timestamptz_eq_timestamp
+syn keyword sqlFunction contained timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
+syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp timestamptz_in
+syn keyword sqlFunction contained timestamptz_larger timestamptz_le timestamptz_le_date
+syn keyword sqlFunction contained timestamptz_le_timestamp timestamptz_lt timestamptz_lt_date
+syn keyword sqlFunction contained timestamptz_lt_timestamp timestamptz_mi timestamptz_mi_interval
+syn keyword sqlFunction contained timestamptz_ne timestamptz_ne_date timestamptz_ne_timestamp
+syn keyword sqlFunction contained timestamptz_out timestamptz_pl_interval timestamptz_recv timestamptz_send
+syn keyword sqlFunction contained timestamptz_smaller timestamptztypmodin timestamptztypmodout
+syn keyword sqlFunction contained timetypmodin timetypmodout timetz timetz_cmp timetz_eq timetz_ge
+syn keyword sqlFunction contained timetz_gt timetz_hash timetz_hash_extended timetz_in
+syn keyword sqlFunction contained timetz_larger timetz_le timetz_lt timetz_mi_interval timetz_ne timetz_out
+syn keyword sqlFunction contained timetz_pl_interval timetz_recv timetz_send timetz_smaller
+syn keyword sqlFunction contained timetzdate_pl timetztypmodin timetztypmodout timezone to_ascii to_char
+syn keyword sqlFunction contained to_date to_hex to_json to_jsonb to_number to_regclass
+syn keyword sqlFunction contained to_regcollation to_regnamespace to_regoper to_regoperator to_regproc
+syn keyword sqlFunction contained to_regprocedure to_regrole to_regtype to_timestamp to_tsquery
+syn keyword sqlFunction contained to_tsvector transaction_timestamp translate trigger_in trigger_out
+syn keyword sqlFunction contained trim_array trim_scale trunc ts_debug ts_delete ts_filter ts_headline
+syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq ts_parse
+syn keyword sqlFunction contained ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type ts_typanalyze
+syn keyword sqlFunction contained tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
+syn keyword sqlFunction contained tsmultirange tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp
+syn keyword sqlFunction contained tsquery_eq tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne
+syn keyword sqlFunction contained tsquery_not tsquery_or tsquery_phrase tsqueryin tsqueryout
+syn keyword sqlFunction contained tsqueryrecv tsquerysend tsrange tsrange_subdiff tstzmultirange tstzrange
+syn keyword sqlFunction contained tstzrange_subdiff tsvector_cmp tsvector_concat tsvector_eq
+syn keyword sqlFunction contained tsvector_ge tsvector_gt tsvector_le tsvector_lt tsvector_ne
+syn keyword sqlFunction contained tsvector_to_array tsvector_update_trigger
+syn keyword sqlFunction contained tsvector_update_trigger_column tsvectorin tsvectorout tsvectorrecv tsvectorsend
+syn keyword sqlFunction contained txid_current txid_current_if_assigned txid_current_snapshot
+syn keyword sqlFunction contained txid_snapshot_in txid_snapshot_out txid_snapshot_recv txid_snapshot_send
+syn keyword sqlFunction contained txid_snapshot_xip txid_snapshot_xmax txid_snapshot_xmin
+syn keyword sqlFunction contained txid_status txid_visible_in_snapshot uhc_to_utf8 unique_key_recheck
+syn keyword sqlFunction contained unistr unknownin unknownout unknownrecv unknownsend unnest upper
+syn keyword sqlFunction contained upper_inc upper_inf utf8_to_big5 utf8_to_euc_cn utf8_to_euc_jis_2004
+syn keyword sqlFunction contained utf8_to_euc_jp utf8_to_euc_kr utf8_to_euc_tw utf8_to_gb18030
+syn keyword sqlFunction contained utf8_to_gbk utf8_to_iso8859 utf8_to_iso8859_1 utf8_to_johab
+syn keyword sqlFunction contained utf8_to_koi8r utf8_to_koi8u utf8_to_shift_jis_2004 utf8_to_sjis
+syn keyword sqlFunction contained utf8_to_uhc utf8_to_win uuid_cmp uuid_eq uuid_ge uuid_gt uuid_hash
+syn keyword sqlFunction contained uuid_hash_extended uuid_in uuid_le uuid_lt uuid_ne uuid_out
+syn keyword sqlFunction contained uuid_recv uuid_send uuid_sortsupport var_pop var_samp varbit varbit_in
+syn keyword sqlFunction contained varbit_out varbit_recv varbit_send varbit_support varbitcmp
+syn keyword sqlFunction contained varbiteq varbitge varbitgt varbitle varbitlt varbitne varbittypmodin
+syn keyword sqlFunction contained varbittypmodout varchar_support varcharin varcharout varcharrecv
+syn keyword sqlFunction contained varcharsend varchartypmodin varchartypmodout variance version
+syn keyword sqlFunction contained void_in void_out void_recv void_send websearch_to_tsquery width
+syn keyword sqlFunction contained width_bucket win1250_to_latin2 win1250_to_mic win1251_to_iso
+syn keyword sqlFunction contained win1251_to_koi8r win1251_to_mic win1251_to_win866 win866_to_iso
+syn keyword sqlFunction contained win866_to_koi8r win866_to_mic win866_to_win1251 win_to_utf8 xid xid8cmp
+syn keyword sqlFunction contained xid8eq xid8ge xid8gt xid8in xid8le xid8lt xid8ne xid8out xid8recv
+syn keyword sqlFunction contained xid8send xideq xideqint4 xidin xidneq xidneqint4 xidout xidrecv
+syn keyword sqlFunction contained xidsend xml xml_in xml_is_well_formed xml_is_well_formed_content
+syn keyword sqlFunction contained xml_is_well_formed_document xml_out xml_recv xml_send xmlagg
+syn keyword sqlFunction contained xmlcomment xmlconcat2 xmlexists xmlvalidate xpath xpath_exists
 " Extensions names
 syn keyword sqlConstant contained address_standardizer address_standardizer_data_us adminpack
 syn keyword sqlConstant contained amcheck autoinc bloom bool_plperl bool_plperlu btree_gin
 syn keyword sqlConstant contained btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw
 syn keyword sqlConstant contained fuzzystrmatch hstore hstore_plperl hstore_plperlu insert_username
 syn keyword sqlConstant contained intagg intarray isn jsonb_plperl jsonb_plperlu lo ltree moddatetime
-syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_prewarm
-syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrouting pgrowlocks
-syn keyword sqlConstant contained pgstattuple pgtap plperl plperlu plpgsql pltcl pltclu postgis
-syn keyword sqlConstant contained postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology
-syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn tsm_system_rows
-syn keyword sqlConstant contained tsm_system_time unaccent xml2
+syn keyword sqlConstant contained old_snapshot pageinspect pg_buffercache pg_freespacemap
+syn keyword sqlConstant contained pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pgcrypto
+syn keyword sqlConstant contained pgrouting pgrowlocks pgstattuple pgtap plperl plperlu plpgsql pltcl
+syn keyword sqlConstant contained pltclu postgis postgis_raster postgis_sfcgal
+syn keyword sqlConstant contained postgis_tiger_geocoder postgis_topology postgres_fdw refint seg sslinfo tablefunc
+syn keyword sqlConstant contained tcn temporal_tables tsm_system_rows tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
 syn keyword sqlConstant contained jsonb_plpython3u ltree_plpython2u ltree_plpython3u
@@ -719,7 +775,7 @@ syn keyword sqlConstant contained ltree_plpythonu pldbgapi plpython2u plpython3u
 if index(get(g:, 'pgsql_disabled_extensions', []), 'refint') == -1
   syn keyword sqlFunction contained check_foreign_key check_primary_key
 endif " refint
-" Extension: postgis (v3.1.0)
+" Extension: postgis (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained addauth addgeometrycolumn box
   syn keyword sqlFunction contained box2d box2d_in box2d_out box2df_in
@@ -1014,7 +1070,7 @@ endif " dict_xsyn
 if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperlu') == -1
   syn keyword sqlFunction contained bool_to_plperlu plperlu_to_bool
 endif " bool_plperlu
-" Extension: address_standardizer (v3.1.0)
+" Extension: address_standardizer (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
   syn keyword sqlType contained stdaddr
@@ -1029,7 +1085,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'xml2') == -1
   syn keyword sqlFunction contained xpath_bool xpath_list xpath_nodeset
   syn keyword sqlFunction contained xpath_number xpath_string xpath_table xslt_process
 endif " xml2
-" Extension: hstore (v1.7)
+" Extension: hstore (v1.8)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'hstore') == -1
   syn keyword sqlFunction contained akeys avals defined delete
   syn keyword sqlFunction contained each exist exists_all exists_any
@@ -1043,12 +1099,12 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'hstore') == -1
   syn keyword sqlFunction contained hstore_ge hstore_gt hstore_hash
   syn keyword sqlFunction contained hstore_hash_extended hstore_in hstore_le hstore_lt
   syn keyword sqlFunction contained hstore_ne hstore_out hstore_recv
-  syn keyword sqlFunction contained hstore_send hstore_to_array hstore_to_json
-  syn keyword sqlFunction contained hstore_to_json_loose hstore_to_jsonb
-  syn keyword sqlFunction contained hstore_to_jsonb_loose hstore_to_matrix hstore_version_diag
-  syn keyword sqlFunction contained isdefined isexists populate_record
-  syn keyword sqlFunction contained skeys slice slice_array svals
-  syn keyword sqlFunction contained tconvert
+  syn keyword sqlFunction contained hstore_send hstore_subscript_handler
+  syn keyword sqlFunction contained hstore_to_array hstore_to_json hstore_to_json_loose
+  syn keyword sqlFunction contained hstore_to_jsonb hstore_to_jsonb_loose
+  syn keyword sqlFunction contained hstore_to_matrix hstore_version_diag isdefined
+  syn keyword sqlFunction contained isexists populate_record skeys slice
+  syn keyword sqlFunction contained slice_array svals tconvert
   syn keyword sqlType contained ghstore hstore
 endif " hstore
 " Extension: pg_visibility (v1.2)
@@ -1057,7 +1113,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_visibility') == -1
   syn keyword sqlFunction contained pg_truncate_visibility_map pg_visibility
   syn keyword sqlFunction contained pg_visibility_map pg_visibility_map_summary
 endif " pg_visibility
-" Extension: cube (v1.4)
+" Extension: cube (v1.5)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlFunction contained cube cube_cmp cube_contained
   syn keyword sqlFunction contained cube_contains cube_coord cube_coord_llur
@@ -1065,15 +1121,15 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlFunction contained cube_ge cube_gt cube_in cube_inter
   syn keyword sqlFunction contained cube_is_point cube_le cube_ll_coord
   syn keyword sqlFunction contained cube_lt cube_ne cube_out cube_overlap
-  syn keyword sqlFunction contained cube_size cube_subset cube_union
-  syn keyword sqlFunction contained cube_ur_coord distance_chebyshev distance_taxicab
-  syn keyword sqlFunction contained g_cube_consistent g_cube_distance
-  syn keyword sqlFunction contained g_cube_penalty g_cube_picksplit g_cube_same
-  syn keyword sqlFunction contained g_cube_union
+  syn keyword sqlFunction contained cube_recv cube_send cube_size
+  syn keyword sqlFunction contained cube_subset cube_union cube_ur_coord
+  syn keyword sqlFunction contained distance_chebyshev distance_taxicab g_cube_consistent
+  syn keyword sqlFunction contained g_cube_distance g_cube_penalty
+  syn keyword sqlFunction contained g_cube_picksplit g_cube_same g_cube_union
   syn keyword sqlType contained cube
   syn keyword sqlFunction contained g_cube_compress g_cube_decompress
 endif " cube
-" Extension: postgis_tiger_geocoder (v3.1.0)
+" Extension: postgis_tiger_geocoder (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') == -1
   syn keyword sqlFunction contained count_words create_census_base_tables
   syn keyword sqlFunction contained cull_null diff_zip
@@ -1104,12 +1160,12 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') ==
   syn keyword sqlTable contained loader_platform loader_variables pagc_gaz
   syn keyword sqlTable contained pagc_lex pagc_rules place place_lookup
   syn keyword sqlTable contained secondary_unit_lookup state state_lookup
-  syn keyword sqlTable contained street_type_lookup tabblock tract zcta5
-  syn keyword sqlTable contained zip_lookup zip_lookup_all zip_lookup_base
-  syn keyword sqlTable contained zip_state zip_state_loc
+  syn keyword sqlTable contained street_type_lookup tabblock tabblock20 tract
+  syn keyword sqlTable contained zcta5 zip_lookup zip_lookup_all
+  syn keyword sqlTable contained zip_lookup_base zip_state zip_state_loc
   syn keyword sqlType contained norm_addy
 endif " postgis_tiger_geocoder
-" Extension: seg (v1.3)
+" Extension: seg (v1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'seg') == -1
   syn keyword sqlFunction contained gseg_consistent gseg_penalty
   syn keyword sqlFunction contained gseg_picksplit gseg_same gseg_union seg_center
@@ -1177,11 +1233,11 @@ endif " pgstattuple
 if index(get(g:, 'pgsql_disabled_extensions', []), 'autoinc') == -1
   syn keyword sqlFunction contained autoinc
 endif " autoinc
-" Extension: address_standardizer_data_us (v3.1.0)
+" Extension: address_standardizer_data_us (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer_data_us') == -1
   syn keyword sqlTable contained us_gaz us_lex us_rules
 endif " address_standardizer_data_us
-" Extension: postgis_topology (v3.1.0)
+" Extension: postgis_topology (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlFunction contained addedge addface addnode
   syn keyword sqlFunction contained addtopogeometrycolumn addtosearchpath asgml
@@ -1214,7 +1270,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlType contained topoelementarray topogeometry
   syn keyword sqlType contained validatetopology_returntype
 endif " postgis_topology
-" Extension: postgis_raster (v3.1.0)
+" Extension: postgis_raster (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_raster') == -1
   syn keyword sqlFunction contained addoverviewconstraints addrasterconstraints
   syn keyword sqlFunction contained box3d bytea dropoverviewconstraints
@@ -1291,6 +1347,10 @@ endif " pg_freespacemap
 if index(get(g:, 'pgsql_disabled_extensions', []), 'file_fdw') == -1
   syn keyword sqlFunction contained file_fdw_handler file_fdw_validator
 endif " file_fdw
+" Extension: pg_surgery (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_surgery') == -1
+  syn keyword sqlFunction contained heap_force_freeze heap_force_kill
+endif " pg_surgery
 " Extension: pg_buffercache (v1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_buffercache') == -1
   syn keyword sqlFunction contained pg_buffercache_pages
@@ -1309,10 +1369,11 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'dblink') == -1
   syn keyword sqlFunction contained dblink_open dblink_send_query
   syn keyword sqlType contained dblink_pkey_results
 endif " dblink
-" Extension: pg_stat_statements (v1.8)
+" Extension: pg_stat_statements (v1.9)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_stat_statements') == -1
-  syn keyword sqlFunction contained pg_stat_statements pg_stat_statements_reset
-  syn keyword sqlView contained pg_stat_statements
+  syn keyword sqlFunction contained pg_stat_statements pg_stat_statements_info
+  syn keyword sqlFunction contained pg_stat_statements_reset
+  syn keyword sqlView contained pg_stat_statements pg_stat_statements_info
 endif " pg_stat_statements
 " Extension: insert_username (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'insert_username') == -1
@@ -1323,6 +1384,10 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_prewarm') == -1
   syn keyword sqlFunction contained autoprewarm_dump_now autoprewarm_start_worker
   syn keyword sqlFunction contained pg_prewarm
 endif " pg_prewarm
+" Extension: old_snapshot (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'old_snapshot') == -1
+  syn keyword sqlFunction contained pg_old_snapshot_time_mapping
+endif " old_snapshot
 " Extension: pgtap (v1.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgtap') == -1
   syn keyword sqlFunction contained is add_result alike
@@ -1415,7 +1480,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'plperlu') == -1
   syn keyword sqlFunction contained plperlu_call_handler plperlu_inline_handler
   syn keyword sqlFunction contained plperlu_validator
 endif " plperlu
-" Extension: intarray (v1.3)
+" Extension: intarray (v1.5)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'intarray') == -1
   syn keyword sqlFunction contained boolop bqarr_in bqarr_out
   syn keyword sqlFunction contained g_int_compress g_int_consistent g_int_decompress
@@ -1431,7 +1496,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'intarray') == -1
   syn keyword sqlFunction contained sort_asc sort_desc subarray uniq
   syn keyword sqlType contained intbig_gkey query_int
 endif " intarray
-" Extension: pg_trgm (v1.5)
+" Extension: pg_trgm (v1.6)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_trgm') == -1
   syn keyword sqlFunction contained gin_extract_query_trgm gin_extract_value_trgm
   syn keyword sqlFunction contained gin_trgm_consistent gin_trgm_triconsistent
@@ -1453,11 +1518,12 @@ endif " pg_trgm
 if index(get(g:, 'pgsql_disabled_extensions', []), 'dict_int') == -1
   syn keyword sqlFunction contained dintdict_init dintdict_lexize
 endif " dict_int
-" Extension: amcheck (v1.2)
+" Extension: amcheck (v1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'amcheck') == -1
   syn keyword sqlFunction contained bt_index_check bt_index_parent_check
+  syn keyword sqlFunction contained verify_heapam
 endif " amcheck
-" Extension: btree_gist (v1.5)
+" Extension: btree_gist (v1.6)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gist') == -1
   syn keyword sqlFunction contained cash_dist date_dist float4_dist
   syn keyword sqlFunction contained float8_dist gbt_bit_compress gbt_bit_consistent
@@ -1532,17 +1598,19 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gist') == -1
   syn keyword sqlType contained gbtreekey16 gbtreekey32 gbtreekey4
   syn keyword sqlType contained gbtreekey8 gbtreekey_var
 endif " btree_gist
-" Extension: pageinspect (v1.8)
+" Extension: pageinspect (v1.9)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pageinspect') == -1
   syn keyword sqlFunction contained brin_metapage_info brin_page_items
   syn keyword sqlFunction contained brin_page_type brin_revmap_data bt_metap
   syn keyword sqlFunction contained bt_page_items bt_page_stats fsm_page_contents
   syn keyword sqlFunction contained get_raw_page gin_leafpage_items
-  syn keyword sqlFunction contained gin_metapage_info gin_page_opaque_info hash_bitmap_info
-  syn keyword sqlFunction contained hash_metapage_info hash_page_items
-  syn keyword sqlFunction contained hash_page_stats hash_page_type heap_page_item_attrs
-  syn keyword sqlFunction contained heap_page_items heap_tuple_infomask_flags
-  syn keyword sqlFunction contained page_checksum page_header tuple_data_split
+  syn keyword sqlFunction contained gin_metapage_info gin_page_opaque_info gist_page_items
+  syn keyword sqlFunction contained gist_page_items_bytea gist_page_opaque_info
+  syn keyword sqlFunction contained hash_bitmap_info hash_metapage_info
+  syn keyword sqlFunction contained hash_page_items hash_page_stats hash_page_type
+  syn keyword sqlFunction contained heap_page_item_attrs heap_page_items
+  syn keyword sqlFunction contained heap_tuple_infomask_flags page_checksum page_header
+  syn keyword sqlFunction contained tuple_data_split
 endif " pageinspect
 " Extension: pltclu (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pltclu') == -1
@@ -1562,7 +1630,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'fuzzystrmatch') == -1
   syn keyword sqlFunction contained levenshtein levenshtein_less_equal
   syn keyword sqlFunction contained metaphone soundex text_soundex
 endif " fuzzystrmatch
-" Extension: pgrouting (v3.1.1)
+" Extension: pgrouting (v3.3.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_alphashape pgr_analyzegraph
   syn keyword sqlFunction contained pgr_analyzeoneway pgr_articulationpoints pgr_astar
@@ -1571,22 +1639,26 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_bddijkstra pgr_bddijkstracost
   syn keyword sqlFunction contained pgr_bddijkstracostmatrix pgr_bellmanford
   syn keyword sqlFunction contained pgr_biconnectedcomponents pgr_binarybreadthfirstsearch
-  syn keyword sqlFunction contained pgr_boykovkolmogorov pgr_breadthfirstsearch pgr_bridges
-  syn keyword sqlFunction contained pgr_chinesepostman pgr_chinesepostmancost
-  syn keyword sqlFunction contained pgr_connectedcomponents pgr_contraction
-  syn keyword sqlFunction contained pgr_createtopology pgr_createverticestable
-  syn keyword sqlFunction contained pgr_dagshortestpath pgr_dijkstra pgr_dijkstracost
-  syn keyword sqlFunction contained pgr_dijkstracostmatrix pgr_dijkstravia
-  syn keyword sqlFunction contained pgr_drivingdistance pgr_edgedisjointpaths pgr_edmondskarp
+  syn keyword sqlFunction contained pgr_bipartite pgr_boykovkolmogorov pgr_breadthfirstsearch
+  syn keyword sqlFunction contained pgr_bridges pgr_chinesepostman
+  syn keyword sqlFunction contained pgr_chinesepostmancost pgr_connectedcomponents
+  syn keyword sqlFunction contained pgr_contraction pgr_createtopology pgr_createverticestable
+  syn keyword sqlFunction contained pgr_dagshortestpath pgr_depthfirstsearch
+  syn keyword sqlFunction contained pgr_dijkstra pgr_dijkstracost
+  syn keyword sqlFunction contained pgr_dijkstracostmatrix pgr_dijkstranear pgr_dijkstranearcost
+  syn keyword sqlFunction contained pgr_dijkstravia pgr_drivingdistance
+  syn keyword sqlFunction contained pgr_edgecoloring pgr_edgedisjointpaths pgr_edmondskarp
   syn keyword sqlFunction contained pgr_edwardmoore pgr_extractvertices
-  syn keyword sqlFunction contained pgr_floydwarshall pgr_full_version pgr_johnson
-  syn keyword sqlFunction contained pgr_kruskal pgr_kruskalbfs pgr_kruskaldd
-  syn keyword sqlFunction contained pgr_kruskaldfs pgr_ksp pgr_linegraph
-  syn keyword sqlFunction contained pgr_linegraphfull pgr_maxcardinalitymatch
-  syn keyword sqlFunction contained pgr_maxflow pgr_maxflowmincost pgr_maxflowmincost_cost
-  syn keyword sqlFunction contained pgr_nodenetwork pgr_pickdeliver
-  syn keyword sqlFunction contained pgr_pickdelivereuclidean pgr_prim pgr_primbfs
-  syn keyword sqlFunction contained pgr_primdd pgr_primdfs pgr_pushrelabel
+  syn keyword sqlFunction contained pgr_floydwarshall pgr_full_version pgr_isplanar
+  syn keyword sqlFunction contained pgr_johnson pgr_kruskal pgr_kruskalbfs
+  syn keyword sqlFunction contained pgr_kruskaldd pgr_kruskaldfs pgr_ksp
+  syn keyword sqlFunction contained pgr_lengauertarjandominatortree pgr_linegraph
+  syn keyword sqlFunction contained pgr_linegraphfull pgr_makeconnected
+  syn keyword sqlFunction contained pgr_maxcardinalitymatch pgr_maxflow pgr_maxflowmincost
+  syn keyword sqlFunction contained pgr_maxflowmincost_cost pgr_nodenetwork
+  syn keyword sqlFunction contained pgr_pickdeliver pgr_pickdelivereuclidean pgr_prim
+  syn keyword sqlFunction contained pgr_primbfs pgr_primdd pgr_primdfs
+  syn keyword sqlFunction contained pgr_pushrelabel pgr_sequentialvertexcoloring
   syn keyword sqlFunction contained pgr_stoerwagner pgr_strongcomponents
   syn keyword sqlFunction contained pgr_topologicalsort pgr_transitiveclosure pgr_trsp
   syn keyword sqlFunction contained pgr_trspviaedges pgr_trspviavertices pgr_tsp
@@ -1606,7 +1678,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgcrypto') == -1
   syn keyword sqlFunction contained pgp_sym_decrypt_bytea pgp_sym_encrypt
   syn keyword sqlFunction contained pgp_sym_encrypt_bytea
 endif " pgcrypto
-" Extension: postgis_sfcgal (v3.1.0)
+" Extension: postgis_sfcgal (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_sfcgal') == -1
   syn keyword sqlFunction contained postgis_sfcgal_noop
   syn keyword sqlFunction contained postgis_sfcgal_scripts_installed postgis_sfcgal_version st_3darea
@@ -1632,8 +1704,10 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'tablefunc') == -1
   syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3
   syn keyword sqlType contained tablefunc_crosstab_4
 endif " tablefunc
-" Extension: postgres_fdw (v1.0)
+" Extension: postgres_fdw (v1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgres_fdw') == -1
+  syn keyword sqlFunction contained postgres_fdw_disconnect
+  syn keyword sqlFunction contained postgres_fdw_disconnect_all postgres_fdw_get_connections
   syn keyword sqlFunction contained postgres_fdw_handler postgres_fdw_validator
 endif " postgres_fdw
 " Extension: bloom (v1.0)
@@ -1740,44 +1814,47 @@ syn keyword sqlCatalog contained foreign_servers foreign_table_options foreign_t
 syn keyword sqlCatalog contained information_schema_catalog_name key_column_usage parameters pg_aggregate pg_am
 syn keyword sqlCatalog contained pg_amop pg_amproc pg_attrdef pg_attribute pg_auth_members pg_authid
 syn keyword sqlCatalog contained pg_available_extension_versions pg_available_extensions
-syn keyword sqlCatalog contained pg_cast pg_class pg_collation pg_config pg_constraint pg_conversion
-syn keyword sqlCatalog contained pg_cursors pg_database pg_db_role_setting pg_default_acl
-syn keyword sqlCatalog contained pg_depend pg_description pg_enum pg_event_trigger pg_extension
-syn keyword sqlCatalog contained pg_file_settings pg_foreign_data_wrapper pg_foreign_server
-syn keyword sqlCatalog contained pg_foreign_table pg_group pg_hba_file_rules pg_index pg_indexes pg_inherits
-syn keyword sqlCatalog contained pg_init_privs pg_language pg_largeobject
-syn keyword sqlCatalog contained pg_largeobject_metadata pg_locks pg_matviews pg_namespace pg_opclass pg_operator
-syn keyword sqlCatalog contained pg_opfamily pg_partitioned_table pg_policies pg_policy
-syn keyword sqlCatalog contained pg_prepared_statements pg_prepared_xacts pg_proc pg_publication
-syn keyword sqlCatalog contained pg_publication_rel pg_publication_tables pg_range pg_replication_origin
-syn keyword sqlCatalog contained pg_replication_origin_status pg_replication_slots pg_rewrite
-syn keyword sqlCatalog contained pg_roles pg_rules pg_seclabel pg_seclabels pg_sequence pg_sequences
-syn keyword sqlCatalog contained pg_settings pg_shadow pg_shdepend pg_shdescription
-syn keyword sqlCatalog contained pg_shmem_allocations pg_shseclabel pg_stat_activity pg_stat_all_indexes
-syn keyword sqlCatalog contained pg_stat_all_tables pg_stat_archiver pg_stat_bgwriter
-syn keyword sqlCatalog contained pg_stat_database pg_stat_database_conflicts pg_stat_gssapi
-syn keyword sqlCatalog contained pg_stat_progress_analyze pg_stat_progress_basebackup pg_stat_progress_cluster
-syn keyword sqlCatalog contained pg_stat_progress_create_index pg_stat_progress_vacuum
-syn keyword sqlCatalog contained pg_stat_replication pg_stat_slru pg_stat_ssl pg_stat_subscription
-syn keyword sqlCatalog contained pg_stat_sys_indexes pg_stat_sys_tables pg_stat_user_functions
-syn keyword sqlCatalog contained pg_stat_user_indexes pg_stat_user_tables pg_stat_wal_receiver
-syn keyword sqlCatalog contained pg_stat_xact_all_tables pg_stat_xact_sys_tables
-syn keyword sqlCatalog contained pg_stat_xact_user_functions pg_stat_xact_user_tables pg_statio_all_indexes
-syn keyword sqlCatalog contained pg_statio_all_sequences pg_statio_all_tables pg_statio_sys_indexes
-syn keyword sqlCatalog contained pg_statio_sys_sequences pg_statio_sys_tables
-syn keyword sqlCatalog contained pg_statio_user_indexes pg_statio_user_sequences pg_statio_user_tables
-syn keyword sqlCatalog contained pg_statistic pg_statistic_ext pg_statistic_ext_data pg_stats
-syn keyword sqlCatalog contained pg_stats_ext pg_subscription pg_subscription_rel pg_tables pg_tablespace
-syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger
-syn keyword sqlCatalog contained pg_ts_config pg_ts_config_map pg_ts_dict pg_ts_parser
-syn keyword sqlCatalog contained pg_ts_template pg_type pg_user pg_user_mapping pg_user_mappings pg_views
-syn keyword sqlCatalog contained referential_constraints role_column_grants role_routine_grants
-syn keyword sqlCatalog contained role_table_grants role_udt_grants role_usage_grants
-syn keyword sqlCatalog contained routine_privileges routines schemata sequences sql_features
-syn keyword sqlCatalog contained sql_implementation_info sql_parts sql_sizing table_constraints table_privileges
-syn keyword sqlCatalog contained tables transforms triggered_update_columns triggers
-syn keyword sqlCatalog contained udt_privileges usage_privileges user_defined_types user_mapping_options
-syn keyword sqlCatalog contained user_mappings view_column_usage view_routine_usage
+syn keyword sqlCatalog contained pg_backend_memory_contexts pg_cast pg_class pg_collation pg_config
+syn keyword sqlCatalog contained pg_constraint pg_conversion pg_cursors pg_database
+syn keyword sqlCatalog contained pg_db_role_setting pg_default_acl pg_depend pg_description pg_enum
+syn keyword sqlCatalog contained pg_event_trigger pg_extension pg_file_settings pg_foreign_data_wrapper
+syn keyword sqlCatalog contained pg_foreign_server pg_foreign_table pg_group pg_hba_file_rules
+syn keyword sqlCatalog contained pg_index pg_indexes pg_inherits pg_init_privs pg_language
+syn keyword sqlCatalog contained pg_largeobject pg_largeobject_metadata pg_locks pg_matviews pg_namespace
+syn keyword sqlCatalog contained pg_opclass pg_operator pg_opfamily pg_partitioned_table
+syn keyword sqlCatalog contained pg_policies pg_policy pg_prepared_statements pg_prepared_xacts pg_proc
+syn keyword sqlCatalog contained pg_publication pg_publication_rel pg_publication_tables
+syn keyword sqlCatalog contained pg_range pg_replication_origin pg_replication_origin_status
+syn keyword sqlCatalog contained pg_replication_slots pg_rewrite pg_roles pg_rules pg_seclabel
+syn keyword sqlCatalog contained pg_seclabels pg_sequence pg_sequences pg_settings pg_shadow pg_shdepend
+syn keyword sqlCatalog contained pg_shdescription pg_shmem_allocations pg_shseclabel
+syn keyword sqlCatalog contained pg_stat_activity pg_stat_all_indexes pg_stat_all_tables pg_stat_archiver
+syn keyword sqlCatalog contained pg_stat_bgwriter pg_stat_database pg_stat_database_conflicts
+syn keyword sqlCatalog contained pg_stat_gssapi pg_stat_progress_analyze
+syn keyword sqlCatalog contained pg_stat_progress_basebackup pg_stat_progress_cluster pg_stat_progress_copy
+syn keyword sqlCatalog contained pg_stat_progress_create_index pg_stat_progress_vacuum pg_stat_replication
+syn keyword sqlCatalog contained pg_stat_replication_slots pg_stat_slru pg_stat_ssl
+syn keyword sqlCatalog contained pg_stat_subscription pg_stat_sys_indexes pg_stat_sys_tables
+syn keyword sqlCatalog contained pg_stat_user_functions pg_stat_user_indexes pg_stat_user_tables pg_stat_wal
+syn keyword sqlCatalog contained pg_stat_wal_receiver pg_stat_xact_all_tables
+syn keyword sqlCatalog contained pg_stat_xact_sys_tables pg_stat_xact_user_functions pg_stat_xact_user_tables
+syn keyword sqlCatalog contained pg_statio_all_indexes pg_statio_all_sequences
+syn keyword sqlCatalog contained pg_statio_all_tables pg_statio_sys_indexes pg_statio_sys_sequences
+syn keyword sqlCatalog contained pg_statio_sys_tables pg_statio_user_indexes pg_statio_user_sequences
+syn keyword sqlCatalog contained pg_statio_user_tables pg_statistic pg_statistic_ext
+syn keyword sqlCatalog contained pg_statistic_ext_data pg_stats pg_stats_ext pg_stats_ext_exprs pg_subscription
+syn keyword sqlCatalog contained pg_subscription_rel pg_tables pg_tablespace
+syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger pg_ts_config
+syn keyword sqlCatalog contained pg_ts_config_map pg_ts_dict pg_ts_parser pg_ts_template pg_type pg_user
+syn keyword sqlCatalog contained pg_user_mapping pg_user_mappings pg_views
+syn keyword sqlCatalog contained referential_constraints role_column_grants role_routine_grants role_table_grants
+syn keyword sqlCatalog contained role_udt_grants role_usage_grants routine_column_usage
+syn keyword sqlCatalog contained routine_privileges routine_routine_usage routine_sequence_usage
+syn keyword sqlCatalog contained routine_table_usage routines schemata sequences sql_features
+syn keyword sqlCatalog contained sql_implementation_info sql_parts sql_sizing table_constraints
+syn keyword sqlCatalog contained table_privileges tables transforms triggered_update_columns triggers
+syn keyword sqlCatalog contained udt_privileges usage_privileges user_defined_types
+syn keyword sqlCatalog contained user_mapping_options user_mappings view_column_usage view_routine_usage
 syn keyword sqlCatalog contained view_table_usage views
 " Error codes (Appendix A, Table A-1)
 syn keyword sqlErrorCode contained active_sql_transaction admin_shutdown ambiguous_alias
@@ -1814,75 +1891,75 @@ syn keyword sqlErrorCode contained fdw_unable_to_create_reply fdw_unable_to_esta
 syn keyword sqlErrorCode contained floating_point_exception foreign_key_violation
 syn keyword sqlErrorCode contained function_executed_no_return_statement generated_always grouping_error
 syn keyword sqlErrorCode contained held_cursor_requires_same_isolation_level
-syn keyword sqlErrorCode contained idle_in_transaction_session_timeout implicit_zero_bit_padding in_failed_sql_transaction
+syn keyword sqlErrorCode contained idle_in_transaction_session_timeout idle_session_timeout implicit_zero_bit_padding
+syn keyword sqlErrorCode contained in_failed_sql_transaction
 syn keyword sqlErrorCode contained inappropriate_access_mode_for_branch_transaction
-syn keyword sqlErrorCode contained inappropriate_isolation_level_for_branch_transaction
-syn keyword sqlErrorCode contained indeterminate_collation indeterminate_datatype index_corrupted indicator_overflow
-syn keyword sqlErrorCode contained insufficient_privilege insufficient_resources
-syn keyword sqlErrorCode contained integrity_constraint_violation internal_error interval_field_overflow
-syn keyword sqlErrorCode contained invalid_argument_for_logarithm
+syn keyword sqlErrorCode contained inappropriate_isolation_level_for_branch_transaction indeterminate_collation indeterminate_datatype
+syn keyword sqlErrorCode contained index_corrupted indicator_overflow insufficient_privilege
+syn keyword sqlErrorCode contained insufficient_resources integrity_constraint_violation internal_error
+syn keyword sqlErrorCode contained interval_field_overflow invalid_argument_for_logarithm
 syn keyword sqlErrorCode contained invalid_argument_for_nth_value_function invalid_argument_for_ntile_function
 syn keyword sqlErrorCode contained invalid_argument_for_power_function
-syn keyword sqlErrorCode contained invalid_argument_for_sql_json_datetime_function invalid_argument_for_width_bucket_function
-syn keyword sqlErrorCode contained invalid_authorization_specification invalid_binary_representation
-syn keyword sqlErrorCode contained invalid_catalog_name invalid_character_value_for_cast
-syn keyword sqlErrorCode contained invalid_column_definition invalid_column_reference invalid_cursor_definition
-syn keyword sqlErrorCode contained invalid_cursor_name invalid_cursor_state
-syn keyword sqlErrorCode contained invalid_database_definition invalid_datetime_format invalid_escape_character
-syn keyword sqlErrorCode contained invalid_escape_octet invalid_escape_sequence invalid_foreign_key
-syn keyword sqlErrorCode contained invalid_function_definition invalid_grant_operation
-syn keyword sqlErrorCode contained invalid_grantor invalid_indicator_parameter_value invalid_json_text
-syn keyword sqlErrorCode contained invalid_locator_specification invalid_name invalid_object_definition
-syn keyword sqlErrorCode contained invalid_parameter_value invalid_password
-syn keyword sqlErrorCode contained invalid_preceding_or_following_size invalid_prepared_statement_definition
-syn keyword sqlErrorCode contained invalid_recursion invalid_regular_expression
+syn keyword sqlErrorCode contained invalid_argument_for_sql_json_datetime_function
+syn keyword sqlErrorCode contained invalid_argument_for_width_bucket_function invalid_authorization_specification
+syn keyword sqlErrorCode contained invalid_binary_representation invalid_catalog_name
+syn keyword sqlErrorCode contained invalid_character_value_for_cast invalid_column_definition invalid_column_reference
+syn keyword sqlErrorCode contained invalid_cursor_definition invalid_cursor_name invalid_cursor_state
+syn keyword sqlErrorCode contained invalid_database_definition invalid_datetime_format
+syn keyword sqlErrorCode contained invalid_escape_character invalid_escape_octet invalid_escape_sequence
+syn keyword sqlErrorCode contained invalid_foreign_key invalid_function_definition
+syn keyword sqlErrorCode contained invalid_grant_operation invalid_grantor invalid_indicator_parameter_value
+syn keyword sqlErrorCode contained invalid_json_text invalid_locator_specification invalid_name
+syn keyword sqlErrorCode contained invalid_object_definition invalid_parameter_value invalid_password
+syn keyword sqlErrorCode contained invalid_preceding_or_following_size
+syn keyword sqlErrorCode contained invalid_prepared_statement_definition invalid_recursion invalid_regular_expression
 syn keyword sqlErrorCode contained invalid_role_specification invalid_row_count_in_limit_clause
-syn keyword sqlErrorCode contained invalid_row_count_in_result_offset_clause invalid_savepoint_specification
-syn keyword sqlErrorCode contained invalid_schema_definition invalid_schema_name
-syn keyword sqlErrorCode contained invalid_sql_json_subscript invalid_sql_statement_name invalid_sqlstate_returned
-syn keyword sqlErrorCode contained invalid_table_definition invalid_tablesample_argument
-syn keyword sqlErrorCode contained invalid_tablesample_repeat invalid_text_representation
-syn keyword sqlErrorCode contained invalid_time_zone_displacement_value invalid_transaction_initiation
-syn keyword sqlErrorCode contained invalid_transaction_state invalid_transaction_termination
-syn keyword sqlErrorCode contained invalid_use_of_escape_character invalid_xml_comment invalid_xml_content
-syn keyword sqlErrorCode contained invalid_xml_document invalid_xml_processing_instruction io_error
-syn keyword sqlErrorCode contained locator_exception lock_file_exists lock_not_available
-syn keyword sqlErrorCode contained modifying_sql_data_not_permitted more_than_one_sql_json_item
-syn keyword sqlErrorCode contained most_specific_type_mismatch name_too_long no_active_sql_transaction
-syn keyword sqlErrorCode contained no_active_sql_transaction_for_branch_transaction
-syn keyword sqlErrorCode contained no_additional_dynamic_result_sets_returned no_data no_data_found
-syn keyword sqlErrorCode contained no_sql_json_item non_numeric_sql_json_item
-syn keyword sqlErrorCode contained non_unique_keys_in_a_json_object nonstandard_use_of_escape_character not_an_xml_document
-syn keyword sqlErrorCode contained not_null_violation null_value_eliminated_in_set_function
-syn keyword sqlErrorCode contained null_value_no_indicator_parameter null_value_not_allowed
-syn keyword sqlErrorCode contained numeric_value_out_of_range object_in_use object_not_in_prerequisite_state
-syn keyword sqlErrorCode contained operator_intervention out_of_memory plpgsql_error
-syn keyword sqlErrorCode contained privilege_not_granted privilege_not_revoked program_limit_exceeded
-syn keyword sqlErrorCode contained prohibited_sql_statement_attempted protocol_violation query_canceled
-syn keyword sqlErrorCode contained raise_exception read_only_sql_transaction
-syn keyword sqlErrorCode contained reading_sql_data_not_permitted reserved_name restrict_violation
-syn keyword sqlErrorCode contained savepoint_exception schema_and_data_statement_mixing_not_supported
-syn keyword sqlErrorCode contained sequence_generator_limit_exceeded serialization_failure
-syn keyword sqlErrorCode contained singleton_sql_json_item_required snapshot_too_old sql_json_array_not_found
-syn keyword sqlErrorCode contained sql_json_member_not_found sql_json_number_not_found
-syn keyword sqlErrorCode contained sql_json_object_not_found sql_json_scalar_required sql_routine_exception
-syn keyword sqlErrorCode contained sql_statement_not_yet_complete
+syn keyword sqlErrorCode contained invalid_row_count_in_result_offset_clause
+syn keyword sqlErrorCode contained invalid_savepoint_specification invalid_schema_definition invalid_schema_name
+syn keyword sqlErrorCode contained invalid_sql_json_subscript invalid_sql_statement_name
+syn keyword sqlErrorCode contained invalid_sqlstate_returned invalid_table_definition
+syn keyword sqlErrorCode contained invalid_tablesample_argument invalid_tablesample_repeat invalid_text_representation
+syn keyword sqlErrorCode contained invalid_time_zone_displacement_value
+syn keyword sqlErrorCode contained invalid_transaction_initiation invalid_transaction_state
+syn keyword sqlErrorCode contained invalid_transaction_termination invalid_use_of_escape_character invalid_xml_comment
+syn keyword sqlErrorCode contained invalid_xml_content invalid_xml_document
+syn keyword sqlErrorCode contained invalid_xml_processing_instruction io_error locator_exception lock_file_exists
+syn keyword sqlErrorCode contained lock_not_available modifying_sql_data_not_permitted
+syn keyword sqlErrorCode contained more_than_one_sql_json_item most_specific_type_mismatch name_too_long
+syn keyword sqlErrorCode contained no_active_sql_transaction
+syn keyword sqlErrorCode contained no_active_sql_transaction_for_branch_transaction no_additional_dynamic_result_sets_returned no_data
+syn keyword sqlErrorCode contained no_data_found no_sql_json_item non_numeric_sql_json_item
+syn keyword sqlErrorCode contained non_unique_keys_in_a_json_object nonstandard_use_of_escape_character
+syn keyword sqlErrorCode contained not_an_xml_document not_null_violation
+syn keyword sqlErrorCode contained null_value_eliminated_in_set_function null_value_no_indicator_parameter
+syn keyword sqlErrorCode contained null_value_not_allowed numeric_value_out_of_range object_in_use
+syn keyword sqlErrorCode contained object_not_in_prerequisite_state operator_intervention out_of_memory
+syn keyword sqlErrorCode contained plpgsql_error privilege_not_granted privilege_not_revoked
+syn keyword sqlErrorCode contained program_limit_exceeded prohibited_sql_statement_attempted
+syn keyword sqlErrorCode contained protocol_violation query_canceled raise_exception
+syn keyword sqlErrorCode contained read_only_sql_transaction reading_sql_data_not_permitted reserved_name
+syn keyword sqlErrorCode contained restrict_violation savepoint_exception
+syn keyword sqlErrorCode contained schema_and_data_statement_mixing_not_supported sequence_generator_limit_exceeded
+syn keyword sqlErrorCode contained serialization_failure singleton_sql_json_item_required snapshot_too_old
+syn keyword sqlErrorCode contained sql_json_array_not_found sql_json_member_not_found
+syn keyword sqlErrorCode contained sql_json_number_not_found sql_json_object_not_found sql_json_scalar_required
+syn keyword sqlErrorCode contained sql_routine_exception sql_statement_not_yet_complete
 syn keyword sqlErrorCode contained sqlclient_unable_to_establish_sqlconnection
 syn keyword sqlErrorCode contained sqlserver_rejected_establishment_of_sqlconnection srf_protocol_violated
-syn keyword sqlErrorCode contained stacked_diagnostics_accessed_without_active_handler statement_completion_unknown
-syn keyword sqlErrorCode contained statement_too_complex string_data_length_mismatch
-syn keyword sqlErrorCode contained string_data_right_truncation substring_error successful_completion syntax_error
-syn keyword sqlErrorCode contained syntax_error_or_access_rule_violation system_error too_many_arguments
-syn keyword sqlErrorCode contained too_many_columns too_many_connections
-syn keyword sqlErrorCode contained too_many_json_array_elements too_many_json_object_members too_many_rows
-syn keyword sqlErrorCode contained transaction_integrity_constraint_violation transaction_resolution_unknown
-syn keyword sqlErrorCode contained transaction_rollback trigger_protocol_violated
-syn keyword sqlErrorCode contained triggered_action_exception triggered_data_change_violation trim_error
-syn keyword sqlErrorCode contained undefined_column undefined_file undefined_function undefined_object
-syn keyword sqlErrorCode contained undefined_parameter undefined_table unique_violation
-syn keyword sqlErrorCode contained unsafe_new_enum_value_usage unterminated_c_string
-syn keyword sqlErrorCode contained untranslatable_character warning windowing_error with_check_option_violation
-syn keyword sqlErrorCode contained wrong_object_type zero_length_character_string
+syn keyword sqlErrorCode contained stacked_diagnostics_accessed_without_active_handler
+syn keyword sqlErrorCode contained statement_completion_unknown statement_too_complex string_data_length_mismatch
+syn keyword sqlErrorCode contained string_data_right_truncation substring_error successful_completion
+syn keyword sqlErrorCode contained syntax_error syntax_error_or_access_rule_violation
+syn keyword sqlErrorCode contained system_error too_many_arguments too_many_columns too_many_connections
+syn keyword sqlErrorCode contained too_many_json_array_elements too_many_json_object_members
+syn keyword sqlErrorCode contained too_many_rows transaction_integrity_constraint_violation
+syn keyword sqlErrorCode contained transaction_resolution_unknown transaction_rollback
+syn keyword sqlErrorCode contained trigger_protocol_violated triggered_action_exception
+syn keyword sqlErrorCode contained triggered_data_change_violation trim_error undefined_column undefined_file
+syn keyword sqlErrorCode contained undefined_function undefined_object undefined_parameter undefined_table
+syn keyword sqlErrorCode contained unique_violation unsafe_new_enum_value_usage unterminated_c_string
+syn keyword sqlErrorCode contained untranslatable_character warning windowing_error
+syn keyword sqlErrorCode contained with_check_option_violation wrong_object_type zero_length_character_string
 
 " Legacy keywords
 syn keyword sqlFunction contained gist_box_compress gist_box_decompress gist_box_fetch
@@ -1919,10 +1996,10 @@ syn match sqlOperator contained "\%(!\~\~\|\#<\#\|\#>\#\|\#>>\|%>>\|&&&\|&/&\|&<
 syn match sqlOperator contained "\%(<<@\|<<|\|<=>\|<@>\|>>=\|?-|\|?<@\|?@>\|?||\|@-@\|@>>\|@@@\|\^<@\|\^@>\||&>\||=|\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 syn match sqlOperator contained "\%(|>>\|||/\|\~<\~\|\~==\|\~>\~\|\~\~\*\|\~\~=\|!!\|!\~\|\#\#\|\#-\|\#=\|\#>\|%\#\|%%\|%>\|&&\|&<\|&>\|\*<\|\*=\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 syn match sqlOperator contained "\%(\*>\|->\|<%\|<<\|<=\|<>\|<@\|<\^\|=>\|>=\|>>\|>\^\|?\#\|?&\|?-\|?@\|?|\|?\~\|@>\|@?\|@@\|\^?\|\^@\|\^\~\||/\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
-syn match sqlOperator contained "\%(||\|\~\*\|\~=\|\~>\|\~\~\|!\|\#\|%\|&\|\*\|+\|-\|/\|<\|=\|>\|?\|@\|\^\||\|\~\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
+syn match sqlOperator contained "\%(||\|\~\*\|\~=\|\~>\|\~\~\|\#\|%\|&\|\*\|+\|-\|/\|<\|=\|>\|?\|@\|\^\||\|\~\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 
 " Comments
-syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell
+syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell,sqlComment
 syn match  sqlComment    "#\s.*$"              contains=sqlTodo,@Spell
 syn match  sqlComment    "--.*$"               contains=sqlTodo,@Spell
 
@@ -1969,6 +2046,7 @@ syn keyword sqlPsqlKeyword contained unicode_border_linestyle unicode_column_lin
 syn keyword sqlPsqlKeyword contained on off auto unaligned pager
 syn keyword sqlPsqlKeyword contained AUTOCOMMIT HISTCONTROL PROMPT VERBOSITY SHOW_CONTEXT VERSION
 syn keyword sqlPsqlKeyword contained DBNAME USER HOST PORT ENCODING HISTSIZE QUIET
+syn keyword sqlPsqlKeyword contained from program pstdin pstdout stdin stdout to where with
 
 " Todo
 syn keyword sqlTodo contained TODO FIXME XXX DEBUG NOTE
@@ -1997,28 +2075,43 @@ syn match sqlPlpgsqlVariable ".\zs@[A-z0-9_]\+" contained
 syn match sqlPlpgsqlOperator ":=" contained
 
 syn region plpgsql matchgroup=sqlString start=+\$\z(pgsql\|body\|function\)\$+ end=+\$\z1\$+ keepend
-  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 if get(g:, 'pgsql_dollar_strings', 0)
   syn region sqlString start=+\$\$+ end=+\$\$+ contains=@Spell
 else
   syn region plpgsql matchgroup=sqlString start=+\$\$+ end=+\$\$+ keepend
-    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 endif
 
-" Folding
-syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=ALL
+let s:plgroups = 'plpgsql'
 
 " PL/<any other language>
 fun! s:add_syntax(s)
   execute 'syn include @PL' . a:s . ' syntax/' . a:s . '.vim'
   unlet b:current_syntax
-  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' . a:s
+  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' .. a:s
+  let s:plgroups .= ',pgsqlpl' . a:s
 endf
 
 for pl in get(b:, 'pgsql_pl', get(g:, 'pgsql_pl', []))
   call s:add_syntax(pl)
 endfor
 
+" Folding
+if get(g:, 'pgsql_fold_functions_only', 0)
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\%(create\s\+[a-z ]*\%(function\|procedure\)\|do\)\>/ end=/;$/ transparent fold '
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
+
+else
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>/ end=/;$/ transparent fold '
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
+
+endif
+
+unlet s:plgroups
+
 " Default highlighting
 hi def link sqlCatalog        Constant
 hi def link sqlComment        Comment