Merge pull request #50 from pankaj-bind/fix-issue-49

Fix: Standardize parameter case handling in parser

Author: ea-rus

mindsdb_sql_parser/parser.py

@@ -165,7 +165,7 @@ def evaluate_kb(self, p):
     # -- Skills --
     @_('CREATE SKILL if_not_exists_or_empty identifier USING kw_parameter_list')
     def create_skill(self, p):
-        params = p.kw_parameter_list
+        params = {k.lower(): v for k, v in p.kw_parameter_list.items()}
 
         return CreateSkill(
             name=p.identifier,
@@ -180,12 +180,12 @@ def drop_skill(self, p):
 
     @_('UPDATE SKILL identifier SET kw_parameter_list')
     def update_skill(self, p):
-        return UpdateSkill(name=p.identifier, updated_params=p.kw_parameter_list)
+        return UpdateSkill(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})
 
     # -- Agent --
     @_('CREATE AGENT if_not_exists_or_empty identifier USING kw_parameter_list')
     def create_agent(self, p):
-        params = p.kw_parameter_list
+        params = {k.lower(): v for k, v in p.kw_parameter_list.items()}
 
         return CreateAgent(
             name=p.identifier,
@@ -201,12 +201,12 @@ def drop_agent(self, p):
     @_('UPDATE AGENT identifier SET kw_parameter_list')
     @_('ALTER AGENT identifier USING kw_parameter_list')
     def update_agent(self, p):
-        return UpdateAgent(name=p.identifier, updated_params=p.kw_parameter_list)
+        return UpdateAgent(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})
 
     # -- ChatBot --
     @_('CREATE CHATBOT identifier USING kw_parameter_list')
     def create_chat_bot(self, p):
-        params = p.kw_parameter_list
+        params = {k.lower(): v for k, v in p.kw_parameter_list.items()}
 
         database = Identifier(params.pop('database'))
         model_param = params.pop('model', None)
@@ -225,7 +225,7 @@ def create_chat_bot(self, p):
 
     @_('UPDATE CHATBOT identifier SET kw_parameter_list')
     def update_chat_bot(self, p):
-        return UpdateChatBot(name=p.identifier, updated_params=p.kw_parameter_list)
+        return UpdateChatBot(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})
 
     @_('DROP CHATBOT identifier')
     def drop_chat_bot(self, p):

tests/test_mindsdb/test_agents.py

@@ -70,3 +70,32 @@ def test_drop_agent(self):
         # Parse again after rendering to catch problems with rendering.
         ast = parse_sql(str(ast))
         assert str(ast) == str(expected_ast)
+
+    def test_create_agent_case_handling(self):
+        sql = """
+            CREATE AGENT my_agent
+            USING
+                MoDeL = 'my_model',
+                SkIlLs = ['skill1', 'skill2']
+        """
+        ast = parse_sql(sql)
+        expected_ast = CreateAgent(
+            name=Identifier('my_agent'),
+            model='my_model',
+            params={'skills': ['skill1', 'skill2']}
+        )
+        assert ast.to_tree() == expected_ast.to_tree()
+
+    def test_update_agent_case_handling(self):
+        sql = """
+            UPDATE AGENT my_agent
+            SET
+                MoDeL = 'new_model',
+                SkIlLs = ['new_skill1', 'new_skill2']
+        """
+        ast = parse_sql(sql)
+        expected_ast = UpdateAgent(
+            name=Identifier('my_agent'),
+            updated_params={'model': 'new_model', 'skills': ['new_skill1', 'new_skill2']}
+        )
+        assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_chatbots.py

@@ -78,3 +78,33 @@ def test_drop_chatbot(self):
         )
         assert str(ast) == str(expected_ast)
         assert ast.to_tree() == expected_ast.to_tree()
+
+    def test_create_chatbot_case_handling(self):
+        sql = """
+            CREATE CHATBOT my_chatbot
+            USING
+                DaTaBaSe = 'my_db',
+                MoDeL = 'my_model',
+                AgEnT = 'my_agent'
+        """
+        ast = parse_sql(sql)
+        expected_ast = CreateChatBot(
+            name=Identifier('my_chatbot'),
+            database=Identifier('my_db'),
+            model=Identifier('my_model'),
+            agent=Identifier('my_agent')
+        )
+        assert ast.to_tree() == expected_ast.to_tree()
+
+    def test_update_chatbot_case_handling(self):
+        sql = """
+            UPDATE CHATBOT my_chatbot
+            SET
+                MoDeL = 'new_model'
+        """
+        ast = parse_sql(sql)
+        expected_ast = UpdateChatBot(
+            name=Identifier('my_chatbot'),
+            updated_params={'model': 'new_model'}
+        )
+        assert ast.to_tree() == expected_ast.to_tree()

tests/test_mindsdb/test_skills.py

@@ -60,3 +60,31 @@ def test_drop_skill(self):
         # Parse again after rendering to catch problems with rendering.
         ast = parse_sql(str(ast))
         assert str(ast) == str(expected_ast)
+
+    def test_create_skill_case_handling(self):
+        sql = """
+            CREATE SKILL my_skill
+            USING
+                TyPe = 'knowledge_base',
+                SoUrCe = 'my_knowledge_base'
+        """
+        ast = parse_sql(sql)
+        expected_ast = CreateSkill(
+            name=Identifier('my_skill'),
+            type='knowledge_base',
+            params={'source': 'my_knowledge_base'}
+        )
+        assert ast.to_tree() == expected_ast.to_tree()
+
+    def test_update_skill_case_handling(self):
+        sql = """
+            UPDATE SKILL my_skill
+            SET
+                SoUrCe = 'new_source'
+        """
+        ast = parse_sql(sql)
+        expected_ast = UpdateSkill(
+            name=Identifier('my_skill'),
+            updated_params={'source': 'new_source'}
+        )
+        assert ast.to_tree() == expected_ast.to_tree()