          'name': 'invalid.illegal'
        }
     ]
-    'name': 'queryInlineGet'
+    'name': 'querySelect'
     'end': '(\\G(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))|((?![ \\t]*from )(?![ \\t]*as )(?![ \\t]*(left[ \\t]+)?*join )(?![ \\t]*where )(?![ \\t]*drop )(?![ \\t]*take )(?![ \\t]*order )(?![ \\t]*orderable )|(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))'
-
-  'queryInlineSelect':
-    'begin': '([ \\t]*select)([ \\t]+from)[ \\t]+([a-zA-Z][_a-zA-Z0-9]*(\\.[a-zA-Z][_a-zA-Z0-9]*)*)(?:[ \\t]+([ \\t]*as)[ \\t]+([ \\t]*[a-zA-Z][_a-zA-Z0-9]*))?([ \\t]*\\n)?'
-    'beginCaptures':
-      '1':
-        'name': 'keyword'
-      '2':
-        'name': 'keyword'
-      '3':
-        'name': 'support.type'
-      '4':
-        'name': 'support.type'
-      '5':
-        'name': 'keyword'
-      '6':
-        'name': 'punctuation.definition.identity'
-    'patterns':[
-       {
-         'include': '#join'
-       }
-       {
-         'include': '#where'
-       }
-       {
-         'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
-         'name': 'invalid.illegal'
-       }
-    ]
-    'name': 'queryInlineSelect'
-    'end': '(\\G(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))|((?![ \\t]*from )(?![ \\t]*as )(?![ \\t]*(left[ \\t]+)?*join )(?![ \\t]*where )(?![ \\t]*drop )(?![ \\t]*take )(?![ \\t]*order )(?![ \\t]*orderable )|(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))'
-
-  'querySelect':
-    'begin': '([ \\t]*[a-zA-Z][_a-zA-Z0-9]*)([ \\t]+select)(?:[ \\t]*(#.*|\\n))?(?:[ \\t]+([ \\t]*from)[ \\t]+[ \\t]*([a-zA-Z][_a-zA-Z0-9]*(\\.[a-zA-Z][_a-zA-Z0-9]*)*))?(?:[ \\t]+([ \\t]*as)[ \\t]+([ \\t]*[a-zA-Z][_a-zA-Z0-9]*))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))*(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*where)[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))?'
-    'beginCaptures':
-      '1':
-        'name': 'punctuation.definition.identity'
-      '2':
-        'name': 'keyword'
-      '3':
-        'name': 'comment'
-      '4':
-        'name': 'keyword'
-      '5':
-        'name': 'support.type'
-      '6':
-        'name': 'support.type'
-      '7':
-        'name': 'keyword'
-      '8':
-        'name': 'punctuation.definition.identity'
-      '9':
-        'name': 'comment'
-      '10':
-        'name': 'object'
-      '11':
-        'name': 'comment'
-      '12':
-        'name': 'keyword'
-      '13':
-        'name': 'object'
-      '14':
-        'name': 'comment'
-      '15':
-        'name': 'object'
-      '16':
-        'name': 'comment'
-      '17':
-        'name': 'object'
-      '18':
-        'name': 'comment'
-      '19':
-        'name': 'object'
-      '20':
-        'name': 'comment'
-      '21':
-        'name': 'object'
-      '22':
-        'name': 'comment'
-      '23':
-        'name': 'object'
-      '24':
-        'name': 'comment'
-      '25':
-        'name': 'object'
-
-    'name': 'querySelect'
-    'patterns':[
-      {
-        'begin': '\\['
-        'patterns': [
-          {
-            'include': '#comments'
-          }
-
-          {
-            'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
-            'name': 'invalid.illegal'
-          }
-        ]
-        'end': '\\]'
-      }
-      {
-        'begin': '\\('
-        'patterns': [
-          {
-            'include': '#comments'
-          }
-
-          {
-            'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
-            'name': 'invalid.illegal'
-          }
-        ]
-        'end': '\\)'
-      }
-      {
-        'begin': '\\{'
-        'patterns': [
-          {
-            'include': '#comments'
-          }
-
-          {
-            'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
-            'name': 'invalid.illegal'
-          }
-        ]
-        'end': '\\}'
-      }
-      {
-        'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
-        'name': 'invalid.illegal'
-      }
-    ]
-    'end': '(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n))'
 
   'readEndpoint':
     'begin': '([ \\t]*[a-zA-Z][_a-zA-Z0-9]*)([ \\t]+read)'

         'include': '#takeVariable'
       }
       {
         'include': '#orderBy'
       }
       {
         'include': '#orderableBy'

        'name': 'keyword'
      '6':
        'name': 'punctuation.definition.identity'
    'patterns':[
       {
         'include': '#opt_from'
       }
       {
         'include': '#opt_as'
       }
       {
         'include': '#join'
       }
       {
         'include': '#where'
       }
       {
         'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
         'name': 'invalid.illegal'
       }
    ]
    'name': 'queryInlineCount'
    'end': '(\\G(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))|((?![ \\t]*from )(?![ \\t]*as )(?![ \\t]*(left[ \\t]+)?*join )(?![ \\t]*where )(?![ \\t]*drop )(?![ \\t]*take )(?![ \\t]*order )(?![ \\t]*orderable )|(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))'

  'queryInlineDelete':
    'begin': '([ \\t]*delete)([ \\t]+from)[ \\t]+([a-zA-Z][_a-zA-Z0-9]*(\\.[a-zA-Z][_a-zA-Z0-9]*)*)(?:[ \\t]+([ \\t]*as)[ \\t]+([ \\t]*[a-zA-Z][_a-zA-Z0-9]*))?([ \\t]*\\n)?'
    'beginCaptures':
      '1':
        'name': 'keyword'
      '2':
        'name': 'keyword'
      '3':
        'name': 'support.type'
      '4':
        'name': 'support.type'
      '5':
        'name': 'keyword'
      '6':
        'name': 'punctuation.definition.identity'
    'patterns':[
       {
         'include': '#opt_from'
       }
       {
         'include': '#opt_as'
       }
       {
         'include': '#join'
       }
       {
         'include': '#where'
       }
       {
         'match': '[^(\\s\\{\\}\\[\\]\\(\\)#,)]+'
         'name': 'invalid.illegal'
       }
    ]
    'name': 'queryInlineDelete'
    'end': '(\\G(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))|((?![ \\t]*from )(?![ \\t]*as )(?![ \\t]*(left[ \\t]+)?*join )(?![ \\t]*where )(?![ \\t]*drop )(?![ \\t]*take )(?![ \\t]*order )(?![ \\t]*orderable )|(?=[ \\t]*(,|#|\\]|\\)|\\}|\\n)))'

  'queryInlineFind':
    'begin': '([ \\t]*from)[ \\t]+([a-zA-Z][_a-zA-Z0-9]*(\\.[a-zA-Z][_a-zA-Z0-9]*)*)(?:[ \\t]+([ \\t]*as)[ \\t]+([ \\t]*[a-zA-Z][_a-zA-Z0-9]*))?(?:[ \\t]+(?:[ \\t]*(#.*|\\n))?[ \\t]+([ \\t]*object))*([ \\t]*\\n)?'
    'beginCaptures':
      '1':
        'name': 'keyword'
      '2':
        'name': 'support.type'
      '3':
        'name': 'support.type'
      '4':
        'name': 'keyword'
      '5':
        'name': 'punctuation.definition.identity'
      '6':
        'name': 'comment'
      '7':
        'name': 'object'
    'patterns':[
       {
         'include': '#opt_from'
