From f6710879d1a1e587d17800682ba0e1045f35e7a9 Mon Sep 17 00:00:00 2001
From: seshotake <116971836+seshotake@users.noreply.github.com>
Date: Sun, 30 Oct 2022 16:54:37 +0000
Subject: [PATCH] Update SQL grammar (#4529)

---
 languages.toml                     |  2 +-
 runtime/queries/sql/highlights.scm | 52 ++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/languages.toml b/languages.toml
index 73915fc29..9c0293f0b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1371,7 +1371,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "0caa7fa2ee00e0b770493a79d4efacc1fc376cc5" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 5025352e7..ece8be333 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -1,3 +1,34 @@
+(keyword_gist) @function.builtin
+(keyword_btree) @function.builtin
+(keyword_btree) @function.builtin
+(keyword_hash) @function.builtin
+(keyword_spgist) @function.builtin
+(keyword_gin) @function.builtin
+(keyword_brin) @function.builtin
+(keyword_float) @function.builtin
+
+(invocation
+  name: (identifier) @function.builtin
+  parameter: [(field)]? @variable.other.member)
+  
+(count
+  name: (identifier) @function.builtin
+  parameter: [(field)]? @variable.other.member)
+  
+(table_reference
+  name: (identifier) @namespace)
+
+(relation
+  table_alias: (identifier) @variable.parameter)
+  
+(field
+  name: (identifier) @variable.other.member)
+  
+(field
+  table_alias: (identifier) @variable.parameter
+  name: (identifier) @variable.other.member)
+
+
 (comment) @comment
 
 [
@@ -5,6 +36,12 @@
   ")"
 ] @punctuation.bracket
 
+[
+  ";"
+  ","
+  "."
+] @punctuation.delimiter
+
 [
   "*"
   "+"
@@ -29,11 +66,8 @@
 
 (literal) @string
 
-(set_schema schema: (identifier) @namespace)
-(table_reference schema: (identifier) @namespace)
-(table_expression schema: (identifier) @namespace)
-(all_fields schema: (identifier) @namespace)
-(field schema: (identifier) @namespace)
+((literal) @constant.numeric
+  (#match? @constant.numeric "^(-?\d*\.?\d*)$"))
 
 [
   (keyword_select)
@@ -54,8 +88,10 @@
   (keyword_lateral)
   (keyword_on)
   (keyword_not)
-  (keyword_order_by)
-  (keyword_group_by)
+  (keyword_order)
+  (keyword_group)
+  (keyword_partition)
+  (keyword_by)
   (keyword_having)
   (keyword_desc)
   (keyword_asc)
@@ -89,6 +125,8 @@
   (keyword_auto_increment)
   (keyword_default)
   (keyword_cascade)
+  (keyword_between)
+  (keyword_window)
   (keyword_with)
   (keyword_no)
   (keyword_data)