release 10.642.24144

klahnakoski · May 23, 2024 · 72f9110 · 72f9110
2 parents df3ba1d + 23adb2f
commit 72f9110
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/mo_sql_parsing/sql_parser.py b/mo_sql_parsing/sql_parser.py
@@ -32,7 +32,7 @@ def mysql_parser(all_columns):
 
 
 def sqlserver_parser(all_columns):
-    atomic_ident = ansi_ident | mysql_backtick_ident | sqlserver_ident | simple_ident
+    atomic_ident = ansi_ident | mysql_backtick_ident | sqlserver_ident | sqlserver_local_ident
     return parser(regex_string | ansi_string, atomic_ident, sqlserver=True, all_columns=all_columns)
 
 

diff --git a/mo_sql_parsing/types.py b/mo_sql_parsing/types.py
@@ -164,9 +164,9 @@
     FLOAT,
     GEOMETRY,
     MAP_TYPE,
+    INT,
     INTEGER,
     INTERVAL,
-    INT,
     INT32,
     INT64,
     BYTEINT,
@@ -265,6 +265,7 @@ 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(

diff --git a/mo_sql_parsing/utils.py b/mo_sql_parsing/utils.py
@@ -911,3 +911,4 @@ def no_dashes(tokens, start, string):
     ident_w_dash_warning = Regex(ident_w_dash.__regex__()[1]).set_parser_name("identifier_with_dashes") / no_dashes
 
 simple_ident = Word(FIRST_IDENT_CHAR, IDENT_CHAR).set_parser_name("identifier")
+sqlserver_local_ident = Word("@" + FIRST_IDENT_CHAR, IDENT_CHAR).set_parser_name("identifier")
diff --git a/packaging/setup.py b/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.641.24143',
+    version='10.642.24144',
     zip_safe=True
 )
diff --git a/packaging/setuptools.json b/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.641.24143",
+    "version": "10.642.24144",
     "zip_safe": true
 }
diff --git a/tests/test_sql_server.py b/tests/test_sql_server.py
@@ -285,7 +285,7 @@ def test_issue_231(self):
                                 "when": {"not": {"eq": [
                                     "t_dt",
                                     {"cast": [
-                                        {"format": ["t_dt", {"literal":"yyyy-MM-ddTHH:mm:ss.ffffff"}]},
+                                        {"format": ["t_dt", {"literal": "yyyy-MM-ddTHH:mm:ss.ffffff"}]},
                                         {"datetimeoffset": {}},
                                     ]},
                                 ]}},
@@ -299,3 +299,14 @@ def test_issue_231(self):
             "from": "dbo.table",
         }
         self.assertEqual(result, expected)
+
+    def test_issue_237_declare_var(self):
+        sql = """create procedure k() BEGIN
+        DECLARE @MYVARIABLE INT = 42;
+        END"""
+        result = parse(sql)
+        expected = {"create_procedure": {
+            "name": "k",
+            "body": {"block": {"declare": {"default": 42, "name": "@MYVARIABLE", "type": {"int": {}},}}},
+        }}
+        self.assertEqual(result, expected)