release 10.646.24152

mo_sql_parsing/formatting.py

@@ -113,7 +113,7 @@ def isolate(expr, sql, prec):
     "where",
     "groupby",
     "having",
-    "union_all"
+    "union_all",
 ]
 
 ordered_clauses = [
@@ -274,7 +274,7 @@ def wordy(v):
             # WITHIN GROUP (
             #             ORDER BY public.persentil.sale
             #           )
-            ob = self.orderby(json['within'], 100)
+            ob = self.orderby(json["within"], 100)
             parts.append(f"WITHIN GROUP ({ob})")
         if "name" in json:
             parts.extend(["AS", self.dispatch(json["name"])])
@@ -590,7 +590,7 @@ def unordered_query(self, json, prec):
             part
             for clause in unordered_clauses
             if clause in json
-            for part in [getattr(self, clause)(json, precedence[clause]+1)]
+            for part in [getattr(self, clause)(json, precedence[clause] + 1)]
             if part
         )
         if prec > precedence["from"]:
@@ -604,7 +604,7 @@ def with_(self, json, prec):
         return f"WITH {parts}"
 
     def union_all(self, json, prec):
-        sql = "\nUNION ALL\n".join(self.dispatch(part) for part in listwrap(json['union_all']))
+        sql = "\nUNION ALL\n".join(self.dispatch(part) for part in listwrap(json["union_all"]))
         return f"{sql}" if prec > precedence["union_all"] else f"({sql})"
 
     def select(self, json, prec):

mo_sql_parsing/sql_parser.py

@@ -61,7 +61,7 @@ def parser(literal_string, simple_ident, all_columns=None, sqlserver=False):
 
         # EXPRESSIONS
         expression = Forward()
-        (column_type, column_definition, column_def_references, column_option,) = get_column_type(
+        (column_type, column_definition, column_def_references, column_option, declare_variable) = get_column_type(
             expression, identifier, literal_string
         )
         proc_param = Group(
@@ -912,7 +912,6 @@ def mult(tokens):
         #############################################################
         statement = Forward()
         special_ident = keyword("masking policy") | identifier / (lambda t: t[0].lower())
-        declare_variable = assign("declare", column_definition)
         set_one_variable = SET + (
             (special_ident + Optional(EQ) + expression)
             / (lambda t: {t[0].lower(): t[1].lower() if isinstance(t[1], str) else t[1]})

mo_sql_parsing/types.py

@@ -22,6 +22,7 @@
     LEFT_ASSOC,
     Keyword,
     Combine,
+    Empty,
 )
 
 from mo_sql_parsing.keywords import (
@@ -266,13 +267,18 @@ def get_column_type(expr, identifier, literal_string):
         | assign("check", LB + expr + RB)
         | assign("default", expr)
         | assign("on update", expr)
-        | (EQ + expr)("default")
     )
 
     column_definition << Group(
         identifier("name") + (column_type | identifier("type")) + ZeroOrMore(column_options)
     ) / to_flat_column_type
 
+    variable_options = assign("default", expr) | EQ + expr("default")
+    declare_variable = assign(
+        "declare",
+        delimited_list(Group(identifier("name") + Optional(AS) + simple_types("type") + ZeroOrMore(variable_options))),
+    )
+
     set_parser_names()
 
-    return column_type, column_definition, column_def_references, column_options
+    return column_type, column_definition, column_def_references, column_options, declare_variable

packaging/setup.py

@@ -15,6 +15,6 @@
     name='mo-sql-parsing',
     packages=["mo_sql_parsing"],
     url='https://github.com/klahnakoski/mo-sql-parsing',
-    version='10.645.24152',
+    version='10.646.24152',
     zip_safe=True
 )

packaging/setuptools.json

@@ -311,6 +311,6 @@
     "name": "mo-sql-parsing",
     "packages": ["mo_sql_parsing"],
     "url": "https://github.com/klahnakoski/mo-sql-parsing",
-    "version": "10.645.24152",
+    "version": "10.646.24152",
     "zip_safe": true
 }

tests/test_sql_server.py

@@ -9,8 +9,6 @@
 
 from unittest import TestCase
 
-from mo_parsing.debug import Debugger
-
 from mo_sql_parsing import parse_sqlserver as parse
 
 
@@ -307,6 +305,46 @@ def test_issue_237_declare_var(self):
         result = parse(sql)
         expected = {"create_procedure": {
             "name": "k",
-            "body": {"block": {"declare": {"default": 42, "name": "@MYVARIABLE", "type": {"int": {}},}}},
+            "body": {"block": {"declare": {"default": 42, "name": "@MYVARIABLE", "type": {"int": {}}, }}},
+        }}
+        self.assertEqual(result, expected)
+
+    def test_issue_237_declare_var_with_as(self):
+        sql = """create procedure k() BEGIN
+        DECLARE @MYVARIABLE AS INT = 42;
+        END"""
+        result = parse(sql)
+        expected = {"create_procedure": {
+            "name": "k",
+            "body": {"block": {"declare": {"default": 42, "name": "@MYVARIABLE", "type": {"int": {}}}}},
+        }}
+        self.assertEqual(result, expected)
+
+    def test_issue_237_declare_multiple_vars(self):
+        sql = """create procedure k() BEGIN
+        DECLARE @MYVAR INT, @MYOTHERVAR DATE;
+        END"""
+        result = parse(sql)
+        expected = {"create_procedure": {
+            "name": "k",
+            "body": {"block": {"declare": [
+                {"name": "@MYVAR", "type": {"int": {}}},
+                {"name": "@MYOTHERVAR", "type": {"date": {}}},
+            ]}},
+        }}
+        self.assertEqual(result, expected)
+
+    def test_issue_237_declare_multiple_vars_with_code(self):
+        sql = """create procedure k() BEGIN
+        DECLARE @MYVAR INT, @MYOTHERVAR DATE;
+        SELECT a FROM rental;
+        END"""
+        result = parse(sql)
+        expected = {"create_procedure": {
+            "name": "k",
+            "body": {"block": [
+                {"declare": [{"name": "@MYVAR", "type": {"int": {}}}, {"name": "@MYOTHERVAR", "type": {"date": {}}}]},
+                {"select": {"value": "a"}, "from": "rental"},
+            ]},
         }}
         self.assertEqual(result, expected)