BUG27602636: EXPRESSIONS IN TABLE.UPDATE().SET() RAISES AN EXCEPTION: UNKNOWN COLUMN 'DOC'

A DocumentPathItem were missing the column name, and it was evaluated to the
default name 'doc' in the server side. With this patch the column name is
taken from the first parameter which generally indicates the column or json_doc.

Author: isrgomez

lib/mysqlx/expr.py

@@ -413,9 +413,10 @@ def escape_literal(string):
 
 
 class ExprParser(object):
-    def __init__(self, string, allow_relational=False):
+    def __init__(self, string, allow_relational=True):
         self.string = string
         self.tokens = []
+        self.path_name_queue = []
         self.pos = 0
         self._allow_relational_columns = allow_relational
         self.placeholder_name_to_position = {}
@@ -624,8 +625,9 @@ def assert_cur_token(self, token_type):
                              "tokens left".format(token_type, self.pos))
         if self.tokens[self.pos].token_type != token_type:
             raise ValueError("Expected token type {0} at pos {1} but found "
-                             "type {2}".format(token_type, self.pos,
-                                               self.tokens[self.pos]))
+                             "type {2}, on tokens {3}"
+                             "".format(token_type, self.pos,
+                                       self.tokens[self.pos], self.tokens))
 
     def cur_token_type_is(self, token_type):
         return self.pos_token_type_is(self.pos, token_type)
@@ -656,13 +658,24 @@ def paren_expr_list(self):
         list and return a list of Expr objects.
         """
         exprs = []
+        path_name_added = False
         self.consume_token(TokenType.LPAREN)
         if not self.cur_token_type_is(TokenType.RPAREN):
-            exprs.append(self._expr().get_message())
+            msg_expr = self._expr().get_message()
+            if hasattr(msg_expr, "identifier") and msg_expr.identifier.name:
+                self.path_name_queue.insert(0, msg_expr.identifier.name)
+                path_name_added = True
+            elif not hasattr(msg_expr, "identifier") and \
+               "identifier" in msg_expr and "name" in msg_expr["identifier"]:
+                self.path_name_queue.insert(0, msg_expr["identifier"]["name"])
+                path_name_added = True
+            exprs.append(msg_expr)
             while self.cur_token_type_is(TokenType.COMMA):
                 self.pos += 1
                 exprs.append(self._expr().get_message())
         self.consume_token(TokenType.RPAREN)
+        if path_name_added:
+            self.path_name_queue.pop()
         return exprs
 
     def identifier(self):
@@ -740,6 +753,8 @@ def document_field(self):
             doc_path_item["value"] = self.consume_token(TokenType.IDENT)
             col_id["document_path"].extend([doc_path_item.get_message()])
         col_id["document_path"].extend(self.document_path())
+        if self.path_name_queue:
+            col_id["name"] = self.path_name_queue[0]
         expr = Message("Mysqlx.Expr.Expr")
         expr["type"] = mysqlxpb_enum("Mysqlx.Expr.Expr.Type.IDENT")
         expr["identifier"] = col_id

tests/test_mysqlx_crud.py

@@ -2504,15 +2504,15 @@ def test_insert(self):
 
     def test_update(self):
         self.session.sql("CREATE TABLE {0}.test(age INT, name "
-                         "VARCHAR(50), gender CHAR(1))"
+                         "VARCHAR(50), gender CHAR(1), `info` json DEFAULT NULL)"
                          "".format(self.schema_name)).execute()
         table = self.schema.get_table("test")
 
-        result = table.insert("age", "name") \
-            .values(21, 'Fred') \
-            .values(28, 'Barney') \
-            .values(42, 'Wilma') \
-            .values(67, 'Betty').execute()
+        result = table.insert("age", "name", "info") \
+            .values(21, 'Fred', {"married": True, "sons": 0}) \
+            .values(28, 'Barney', {"married": True, "sons": 1}) \
+            .values(42, 'Wilma', {"married": True, "sons": 0}) \
+            .values(67, 'Betty', {"married": True, "sons": 1}).execute()
 
         result = table.update().set("age", 25).where("age == 21").execute()
         self.assertEqual(1, result.get_affected_items_count())
@@ -2521,6 +2521,12 @@ def test_update(self):
         result = table.update().set("age", 25)
         self.assertRaises(mysqlx.ProgrammingError, result.execute)
 
+        # Update with a mysqlx expression
+        statement =  table.update()
+        statement.set("info", mysqlx.expr("JSON_SET(info, '$.sons', $.sons * 2)"))
+        result = statement.where( "name = 'Barney' or name = 'Betty'").execute()
+        assert (2 == result.get_affected_items_count())
+
         drop_table(self.schema, "test")
 
     def test_delete(self):