[SQL] use inheritance to support different dialects

Go/Embeddings/SQL (for Go Embedded Backtick Strings).sublime-syntax

@@ -2,7 +2,7 @@
 ---
 name: SQL inside Go backtick string
 scope: source.sql.go-embedded-backtick-string
-version: 1
+version: 2
 hidden: true
 
 extends: Packages/SQL/SQL.sublime-syntax

Go/tests/syntax_test_go.go

@@ -5759,7 +5759,7 @@ func lang_embedding() {
     //          ^ meta.string.go string.quoted.backtick.go punctuation.definition.string.begin.go
     //           ^ meta.string.go meta.embedded.go source.sql.embedded.go
         update schema.table
-    //  ^^^^^^ meta.string.go meta.embedded.go source.sql.embedded.go keyword.other.DML.sql
+    //  ^^^^^^ meta.string.go meta.embedded.go source.sql.embedded.go keyword.other.dml.sql
         set
           some_field = null
         where

PHP/Embeddings/SQL (for PHP Interpolated).sublime-syntax

@@ -1,6 +1,7 @@
 %YAML 1.2
 ---
 scope: source.sql.interpolated.php
+version: 2
 hidden: true
 
 extends: Packages/SQL/SQL.sublime-syntax
@@ -10,14 +11,24 @@ contexts:
     - meta_prepend: true
     - include: Packages/PHP/PHP Source.sublime-syntax#interpolations
 
+  main:
+    - meta_prepend: true
+    # prevent stray bracket highlighting
+    - match: \)
+      scope: punctuation.section.group.end.sql
+
+  single-identifier:
+    - meta_prepend: true
+    - meta_include_prototype: false
+    - include: Packages/PHP/PHP Source.sublime-syntax#interpolation
+
   inside-like-single-quoted-string:
     - meta_prepend: true
-    - include: Packages/PHP/PHP Source.sublime-syntax#string-interpolations
+    - include: string-interpolation
 
-  string-escape:
-    # this context is included in anonymous string contexts
+  inside-single-quoted-string:
     - meta_prepend: true
-    - include: Packages/PHP/PHP Source.sublime-syntax#string-interpolations
+    - include: string-interpolation
 
   string-interpolation:
     # this context is included in anonymous string contexts

PHP/Embeddings/SQL (for PHP).sublime-syntax

@@ -1,6 +1,7 @@
 %YAML 1.2
 ---
 scope: source.sql.embedded.php
+version: 2
 hidden: true
 
 extends: Packages/SQL/SQL.sublime-syntax
@@ -11,6 +12,12 @@ contexts:
     - include: php-single-quoted-strings
     - include: php-string-single-quoted-escapes
 
+  main:
+    - meta_prepend: true
+    # prevent stray bracket highlighting
+    - match: \)
+      scope: punctuation.section.group.end.sql
+
   php-string-single-quoted-escapes:
     - match: \\[\\']
       scope: constant.character.escape.php

PHP/PHP Source.sublime-syntax

@@ -1775,6 +1775,24 @@ contexts:
     - match: (?=\${{identifier_start}})
       push: interpolation-literal-variable
 
+  interpolation:
+    # PHP variable/expressions interpolated into foreign
+    # source code without clearing any string scopes.
+    #
+    # Prevents: "c:\{$foo}"
+    - match: \\\{
+    # Handles: "foo{$bar}baz"
+    - match: \{(?=\$)
+      scope: punctuation.section.interpolation.begin.php
+      set: interpolation-braced-expression
+    # Handles: "foo${bar}baz"
+    - match: \$\{
+      scope: punctuation.definition.variable.begin.php
+      set: interpolation-braced-variable
+    # Handles: $foo, $foo[0], $foo[$bar], $foo->bar
+    - match: (?=\${{identifier_start}})
+      set: interpolation-literal-variable
+
   interpolation-braced-expression:
     - meta_include_prototype: false
     - meta_scope: meta.interpolation.php

PHP/tests/syntax_test_php.php

@@ -5052,21 +5052,21 @@ function testTypeCasts()
 //     ^ meta.string.php string.quoted.double.php punctuation.definition.string.begin.php - meta.interpolation - string string
 //      ^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.double.php
 //                          ^ meta.string.php string.quoted.double.php punctuation.definition.string.end.php - meta.interpolation - string string
-//      ^^^^^^ keyword.other.create.sql
+//      ^^^^^^ keyword.other.ddl.sql
 
 $sql = "
     CREATE TABLE `version`...
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.double.php
-//  ^^^^^^ keyword.other.create.sql
+//  ^^^^^^ keyword.other.ddl.sql
 ";
 
 // Do not highlight plain SQL indicator as SQL
 $sql = "SELECT";
-//      ^^^^^^ - keyword.other.DML
+//      ^^^^^^ - keyword.other.dml
 
 $sql = "
     SELECT
-//  ^^^^^^ keyword.other.DML
+//  ^^^^^^ keyword.other.dml
     *
     FROM users
     WHERE first_name = 'Eric'
@@ -5075,34 +5075,46 @@ function testTypeCasts()
 $sql = "SELECT * FROM users WHERE first_name = 'Eric'";
 //     ^ meta.string.php string.quoted.double.php punctuation.definition.string.begin.php - meta.interpolation - string string
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.double.php
-//      ^ keyword.other.DML
+//      ^ keyword.other.dml
 //                                             ^^^^^^ string.quoted.single.sql
 //                                                   ^ meta.string.php string.quoted.double.php punctuation.definition.string.end.php - meta.interpolation - string string
 
 // Ensure we properly exist from SQL when hitting PHP end-of-string
 $sql = "SELECT * FROM users WHERE first_name = 'Eric";
 //     ^ meta.string.php string.quoted.double.php punctuation.definition.string.begin.php - meta.interpolation - string string
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.double.php
-//      ^ keyword.other.DML
+//      ^ keyword.other.dml
 //                                             ^^^^^ string.quoted.single.sql
 //                                                  ^ meta.string.php string.quoted.double.php punctuation.definition.string.end.php - meta.interpolation - string string
 
 $sql = "
     SELECT * FROM users WHERE first_name = 'Eric'
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.double.php
-//  ^ keyword.other.DML
+//  ^ keyword.other.dml
+//                      ^^^^^ keyword.other.dml.sql
 //                                         ^^^^^^ string.quoted.single.sql
 ";
 // <- meta.string.php string.quoted.double.php punctuation.definition.string.end.php - meta.interpolation - string string
 
+$sql = "SELECT `$col` FROM 'my$table--name'";
+//             ^^^^^^ meta.column-name.sql
+//             ^ punctuation.definition.identifier.begin.sql
+//              ^^^^ meta.interpolation.php variable.other.php
+//                  ^ punctuation.definition.identifier.end.sql
+//                    ^^^^ keyword.other.dml.sql
+//                         ^^^^^^^^^^^^^^^^ meta.table-name.sql
+//                         ^ punctuation.definition.identifier.begin.sql
+//                            ^^^^^^ meta.interpolation.php variable.other.php
+//                                        ^ punctuation.definition.identifier.end.sql
+
 $sql = "SELECT * FROM users where first_name = $user_name";
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php - meta.interpolation
-//                                             ^^^^^^^^^^ meta.string.php meta.interpolation.php variable.other.php - string
+//                                             ^^^^^^^^^^ meta.string.php meta.interpolation.php variable.other.php - string.quoted.double
 //                                                       ^ meta.string.php - meta.interpolation
 
 $sql = "SELECT * FROM users where first_name = '$user_name'";
 //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php - meta.interpolation
-//                                              ^^^^^^^^^^ meta.string.php meta.interpolation.php variable.other.php - string
+//                                              ^^^^^^^^^^ meta.string.php meta.interpolation.php variable.other.php - string.quoted
 //                                                        ^ meta.string.php - meta.interpolation
 
 $sql = "SELECT * FROM users where first_name = `$user_name`";
@@ -5131,22 +5143,12 @@ function testTypeCasts()
 //             ^ meta.string.php - meta.interpolation
 //              ^^^^^^^^^^ - meta.string
 //                        ^ meta.string.php - meta.interpolation
-//                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php
-//                                                         ^ meta.string.php - meta.interpolation
-//                                                          ^^^^^^^^^^^ - meta.string
-//                                                                     ^ meta.string.php - meta.interpolation
-//                                                                      ^ meta.string.php source.sql.embedded.php
-//                                                                       ^ meta.string.php - meta.interpolation
-//                                                                        ^^^^^ - meta.string
-//                                                                             ^^^^^^^^^^ meta.string.php string.quoted.double.php - meta.interpolation
-//     ^ string.quoted.double.php punctuation.definition.string.begin.php
-//      ^^^^^^ keyword.other.DML.sql
-//             ^ string.quoted.double.php punctuation.definition.string.end.php
-//               ^ keyword.operator.concatenation.php
-//                 ^^^^ variable.other.php
-//                      ^ keyword.operator.concatenation.php
-//                        ^ string.quoted.double.php punctuation.definition.string.begin.php
-//                              ^^^^^^ variable.other.php
+//                         ^^^^^ meta.string.php source.sql.embedded.php - meta.interpolation
+//                              ^^^^^^ meta.string.php source.sql.embedded.php meta.table-name.sql meta.interpolation.php
+//                                    ^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - meta.interpolation
+//                                           ^ punctuation.section.group.begin.sql
+//                                             ^^^^^^^^^^ meta.column-name.sql - variable
+//                                                        ^ keyword.operator.comparison.sql
 //                                                         ^ string.quoted.double.php punctuation.definition.string.end.php
 //                                                           ^ keyword.operator.concatenation.php
 //                                                             ^^^^^ variable.other.php
@@ -5192,7 +5194,7 @@ function testTypeCasts()
 $sql = 'SELECT * FROM users WHERE first_name = \'Eric\'';
 //     ^ meta.string.php string.quoted.single.php punctuation.definition.string.begin.php - meta.interpolation - string string
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.single.php
-//      ^ keyword.other.DML
+//      ^ keyword.other.dml
 //                                             ^^^^^^^^ meta.string.sql string.quoted.single.sql
 //                                             ^^ constant.character.escape.php
 //                                                   ^^ constant.character.escape.php
@@ -5201,7 +5203,7 @@ function testTypeCasts()
 $sql = '
     SELECT * FROM users WHERE first_name = \'Eric\'
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.php source.sql.embedded.php - string.quoted.single.php
-//  ^ keyword.other.DML
+//  ^ keyword.other.dml
 //                                         ^^ constant.character.escape.php
 ';
 // <- meta.string.php string.quoted.single.php punctuation.definition.string.end.php - meta.interpolation - string string
@@ -5221,7 +5223,7 @@ function testTypeCasts()
 //                                                                       ^^^^^ - meta.string
 //                                                                            ^^^^^^^^^^ meta.string.php string.quoted.single.php - meta.interpolation
 //     ^ string.quoted.single.php punctuation.definition.string.begin.php
-//      ^^^^^^ keyword.other.DML.sql
+//      ^^^^^^ keyword.other.dml.sql
 //             ^ string.quoted.single.php punctuation.definition.string.end.php
 //               ^ keyword.operator.concatenation.php
 //                 ^^^^ variable.other.php
@@ -5418,7 +5420,7 @@ function testTypeCasts()
 //      ^^^ entity.name.tag.heredoc
 SELECT * FROM users WHERE first_name = 'John' LIMIT $limit
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.sql source.sql.embedded.php
-// <- keyword.other.DML
+// <- keyword.other.dml
 //     ^ constant.other.wildcard.asterisk
 //                                     ^^^^^^ string.quoted.single
 //                                                  ^^^^^^ variable.other.php
@@ -5435,7 +5437,7 @@ function testTypeCasts()
 //       ^^^ entity.name.tag.heredoc
 SELECT * FROM users WHERE first_name = 'John'\n
 //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.sql source.sql.embedded.php
-// <- keyword.other.DML
+// <- keyword.other.dml
 //     ^ constant.other.wildcard.asterisk
 //                                     ^^^^^^ string.quoted.single
 //                                           ^^ - constant.character.escape.php

Python/tests/syntax_test_python_strings.py

@@ -30,61 +30,61 @@
 #                      ^^ invalid.deprecated.character.escape.python
 
 conn.execute("SELECT * FROM foobar")
-#              ^ meta.string.python keyword.other.DML.sql
+#              ^ meta.string.python keyword.other.dml.sql
 
 conn.execute('SELECT * FROM foobar')
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 conn.execute(U"SELECT * FROM foobar")
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 conn.execute(U'SELECT * FROM foobar')
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 # In this example, the Python string is not raw, so \t is a python escape
 conn.execute(u"SELECT * FROM foobar WHERE foo = '\t'")
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 #                                                 ^ constant.character.escape.python
 
 conn.execute(u'SELECT * FROM foobar')
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 # In this example, the Python string is raw, so the \b should be a SQL escape
 conn.execute(r"SELECT * FROM foobar WHERE baz = '\b")
-#              ^ meta.string.python keyword.other.DML.sql
+#              ^ meta.string.python keyword.other.dml.sql
 #                                                 ^ constant.character.escape.sql
 
 # This tests to ensure the Python placeholder will be highlighted even in a raw SQL string
 conn.execute(r'SELECT * FROM foobar WHERE %s')
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 #                                         ^ constant.other.placeholder.python
 
 conn.execute(r"SELECT * FROM foobar")
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 conn.execute(r'SELECT * FROM foobar')
-#              ^ keyword.other.DML.sql
+#              ^ keyword.other.dml.sql
 
 conn.execute(r"""SELECT * FROM foobar WHERE %s and foo = '\t'""")
-#                 ^ keyword.other.DML.sql
+#                 ^ keyword.other.dml.sql
 #                                            ^ constant.other.placeholder.python
 #                                                          ^ constant.character.escape.sql
 
 # Capital R prevents all syntax embedding
 conn.execute(R'SELECT * FROM foobar')
-#              ^ meta.string.python - keyword.other.DML.sql
+#              ^ meta.string.python - keyword.other.dml.sql
 
 conn.execute(R"SELECT * FROM foobar")
-#              ^ - keyword.other.DML.sql
+#              ^ - keyword.other.dml.sql
 
 conn.execute(R"""SELECT * FROM foobar""")
-#                ^ - keyword.other.DML.sql
+#                ^ - keyword.other.dml.sql
 
 conn.execute(r'''SELECT * FROM foobar''')
-#                 ^ keyword.other.DML.sql
+#                 ^ keyword.other.dml.sql
 
 conn.execute(u"""SELECT * FROM foobar WHERE %s and foo = '\t'""")
-#                 ^ keyword.other.DML.sql
+#                 ^ keyword.other.dml.sql
 #                                            ^ constant.other.placeholder.python
 #                                                          ^ constant.character.escape.python
 
@@ -198,7 +198,7 @@
                 EXISTS(
                 select 1)
             ELSE NULL
-        ) as result
+        END) as result
     """ + test
 #   ^^^ meta.string.python string.quoted.double.block.python punctuation.definition.string.end.python
 #       ^ keyword.operator.arithmetic.python
@@ -216,7 +216,7 @@
                 EXISTS(
                 select 1)
             ELSE NULL
-        ) as result
+        END) as result
     """
 
 query = \
@@ -230,7 +230,7 @@
             EXISTS(
             select 1)
         ELSE NULL
-    ) as result
+    END) as result
 '''
 
 query = """

Rails/SQL (Rails).sublime-syntax

@@ -2,6 +2,7 @@
 ---
 name: SQL (Rails)
 scope: source.sql.rails
+version: 2
 
 extends: Packages/SQL/SQL.sublime-syntax
 

Ruby/Embeddings/SQL (for Ruby).sublime-syntax

@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
 scope: source.sql.embedded.ruby
-# version: 2
+version: 2
 hidden: true
 
 extends: Packages/SQL/SQL.sublime-syntax