diff --git a/src/dataTypes.ts b/src/dataTypes.ts
index bf8fe68..bf27c97 100644
--- a/src/dataTypes.ts
+++ b/src/dataTypes.ts
@@ -1,12 +1,16 @@
 export default [
   "binary",
   "boolean",
+  "byte",
+  "char",
   "date",
   "double",
   "float",
   "geohash",
   "int",
+  "ipv4",
   "long",
+  "long128",
   "long256",
   "short",
   "string",
diff --git a/src/functions.ts b/src/functions.ts
index 585a9e9..18a77b9 100644
--- a/src/functions.ts
+++ b/src/functions.ts
@@ -1,46 +1,148 @@
 export default [
+  "<<",
+  "<<=",
+  ">>",
+  ">>=",
+  "VARCHAR",
   "abs",
+  "acos",
   "all_tables",
+  "and",
+  "asin",
+  "atan",
+  "atan2",
   "avg",
+  "base64",
   "batch",
+  "between",
+  "build",
+  "case",
   "cast",
+  "ceil",
+  "ceiling",
   "coalesce",
   "commitLag",
   "concat",
+  "cos",
+  "cot",
   "count",
+  "count_distinct",
+  "current_database",
+  "current_schema",
+  "current_schemas",
+  "current_user",
+  "date_trunc",
   "dateadd",
   "datediff",
   "day",
   "day_of_week",
   "day_of_week_sunday_first",
   "days_in_month",
+  "degrees",
+  "dump_memory_usage",
+  "dump_thread_stacks",
+  "extract",
   "first",
+  "floor",
+  "flush_query_cache",
   "format",
+  "format_type",
+  "functions",
+  "haversine_dist_deg",
   "headers",
   "hour",
   "ifnull",
+  "ilike",
+  "in",
+  "information_schema._pg_expandarray",
+  "isOrdered",
   "is_leap_year",
   "isnull",
+  "keywords",
   "ksum",
   "lag",
   "last",
   "lcase",
+  "left",
   "len",
   "length",
+  "like",
+  "list",
+  "ln",
+  "log",
   "long_sequence",
+  "lower",
+  "lpad",
+  "ltrim",
   "make_geohash",
   "max",
   "maxUncommittedRows",
+  "memory_metrics",
   "micros",
   "mid",
   "millis",
   "min",
   "minute",
   "month",
+  "netmask",
+  "not",
   "now",
   "nsum",
+  "nullif",
   "nvl",
+  "or",
+  "pg_advisory_unlock_all",
+  "pg_attrdef",
+  "pg_attribute",
+  "pg_catalog.age",
+  "pg_catalog.current_database",
+  "pg_catalog.current_schema",
+  "pg_catalog.current_schemas",
+  "pg_catalog.pg_attrdef",
+  "pg_catalog.pg_attribute",
+  "pg_catalog.pg_class",
+  "pg_catalog.pg_database",
+  "pg_catalog.pg_description",
+  "pg_catalog.pg_get_expr",
+  "pg_catalog.pg_get_keywords",
+  "pg_catalog.pg_get_partkeydef",
+  "pg_catalog.pg_get_userbyid",
+  "pg_catalog.pg_index",
+  "pg_catalog.pg_inherits",
+  "pg_catalog.pg_is_in_recovery",
+  "pg_catalog.pg_locks",
+  "pg_catalog.pg_namespace",
+  "pg_catalog.pg_roles",
+  "pg_catalog.pg_shdescription",
+  "pg_catalog.pg_table_is_visible",
+  "pg_catalog.pg_type",
+  "pg_catalog.txid_current",
+  "pg_catalog.version",
+  "pg_class",
+  "pg_database",
+  "pg_description",
+  "pg_get_expr",
+  "pg_get_keywords",
+  "pg_get_partkeydef",
+  "pg_index",
+  "pg_inherits",
+  "pg_is_in_recovery",
+  "pg_locks",
+  "pg_namespace",
+  "pg_postmaster_start_time",
+  "pg_proc",
+  "pg_range",
+  "pg_roles",
+  "pg_type",
+  "pi",
+  "position",
+  "power",
+  "radians",
   "rank",
+  "reader_pool",
+  "regexp_replace",
+  "replace",
+  "right",
   "rnd_bin",
   "rnd_boolean",
   "rnd_byte",
@@ -51,6 +153,7 @@ export default [
   "rnd_geohash",
   "rnd_int",
   "rnd_ipv4",
+  "rnd_log",
   "rnd_long",
   "rnd_long256",
   "rnd_short",
@@ -62,20 +165,54 @@ export default [
   "round_down",
   "round_half_even",
   "round_up",
+  "row_number",
+  "rpad",
+  "rtrim",
   "second",
+  "session_user",
+  "simulate_crash",
+  "sin",
+  "size_pretty",
+  "split_part",
+  "sqrt",
+  "starts_with",
+  "stddev_samp",
+  "string_agg",
+  "strpos",
+  "substring",
   "sum",
+  "switch",
   "sysdate",
   "systimestamp",
   "table_columns",
+  "table_partitions",
+  "table_writer_metrics",
+  "tables",
+  "tan",
   "timestamp_ceil",
   "timestamp_floor",
   "timestamp_sequence",
+  "timestamp_shuffle",
+  "to_char",
   "to_date",
+  "to_long128",
+  "to_lowercase",
+  "to_pg_date",
   "to_str",
   "to_timestamp",
   "to_timezone",
+  "to_uppercase",
   "to_utc",
+  "to_uuid",
+  "touch",
+  "trim",
+  "txid_current",
+  "typeOf",
   "ucase",
+  "upper",
+  "version",
+  "wal_tables",
+  "week_of_year",
   "within",
   "year",
 ]
diff --git a/src/keywords.ts b/src/keywords.ts
index 352c1e8..0d18803 100644
--- a/src/keywords.ts
+++ b/src/keywords.ts
@@ -18,6 +18,7 @@ export default [
   "cast",
   "column",
   "columns",
+  "complete",
   "copy",
   "create",
   "cross",
@@ -70,6 +71,8 @@ export default [
   "over",
   "param",
   "partition",
+  "partitions",
+  "prepare",
   "primary",
   "references",
   "rename",
@@ -79,7 +82,9 @@ export default [
   "select",
   "set",
   "show",
+  "snapshot",
   "splice",
+  "squash",
   "system",
   "table",
   "tables",
@@ -98,9 +103,4 @@ export default [
   "with",
   "writer",
   "zone",
-  "snapshot",
-  "prepare",
-  "complete",
-  "squash",
-  "partitions",
 ]