Merge branch 'release/8.0.5'

Author: prashanttekriwal

cpyint

@@ -35,7 +35,8 @@
 from .dbdoc import DbDoc
 from .errors import (Error, Warning, InterfaceError, DatabaseError,
                      NotSupportedError, DataError, IntegrityError,
-                     ProgrammingError, OperationalError, InternalError)
+                     ProgrammingError, OperationalError, InternalError,
+                     PoolError)
 from .result import (ColumnMetaData, Row, Result, BufferingResult, RowResult,
                      SqlResult, ColumnType)
 from .statement import (Statement, FilterableStatement, SqlStatement,
@@ -278,7 +279,7 @@ def get_session(*args, **kwargs):
     # mysqlx.errors
     "Error", "Warning", "InterfaceError", "DatabaseError", "NotSupportedError",
     "DataError", "IntegrityError", "ProgrammingError", "OperationalError",
-    "InternalError",
+    "InternalError", "PoolError",
 
     # mysqlx.result
     "ColumnMetaData", "Row", "Result", "BufferingResult", "RowResult",

lib/mysqlx/__init__.py

@@ -24,8 +24,8 @@
 """Implementation of Session Configuration"""
 
 import os
+import sys
 import json
-import platform
 
 from .compat import STRING_TYPES
 from .errors import OperationalError, InterfaceError
@@ -343,12 +343,14 @@ def items(self):
         return self._configs.items()
 
     def _load_default_paths(self):
-        if platform.system() == "Windows":
+        if sys.platform.startswith("win"):
             self._usr_file = os.path.join(
                 os.getenv("APPDATA"), "MySQLsessions.json")
             self._sys_file = os.path.join(
                 os.getenv("PROGRAMDATA"), "MySQLsessions.json")
-        elif platform.system() == "Linux":
+        elif sys.platform.startswith("linux") or \
+             sys.platform.startswith("darwin") or \
+             sys.platform.startswith("sunos"):
             self._usr_file = os.path.join(
                 os.getenv("HOME"), ".mysql", "sessions.json")
             self._sys_file = os.path.join(

lib/mysqlx/config.py

@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -52,4 +52,4 @@ def create_enum(name, fields, values=None):
 Auth = create_enum("Auth", ("PLAIN", "EXTERNAL", "MYSQL41"),
                            ("plain", "external", "mysql41"))
 
-__all__ = ["Algorithms", "Securities", "CheckOptions"]
+__all__ = ["Algorithms", "Securities", "CheckOptions", "SSLMode", "Auth"]

lib/mysqlx/constants.py

@@ -1165,10 +1165,6 @@ def parse_table_select_projection(self):
             if self.cur_token_type_is(TokenType.AS):
                 self.consume_token(TokenType.AS)
                 projection["alias"] = self.consume_token(TokenType.IDENT)
-            elif get_item_or_attr(projection["source"], "type") is \
-                mysqlxpb_enum("Mysqlx.Expr.Expr.Type.IDENT"):
-                self.pos -= 1
-                projection["alias"] = self.consume_token(TokenType.IDENT)
             else:
                 projection["alias"] = fields[len(project_expr)]
             project_expr.append(projection.get_message())

lib/mysqlx/expr.py

@@ -24,7 +24,8 @@
 """This module contains the implementation of a helper class for MySQL X
 Protobuf messages."""
 
-from mysqlx.compat import NUMERIC_TYPES, STRING_TYPES, BYTE_TYPES
+from mysqlx.compat import PY3, NUMERIC_TYPES, STRING_TYPES, BYTE_TYPES
+from mysqlx.helpers import encode_to_bytes
 
 
 _SERVER_MESSAGES_TUPLES = (
@@ -93,6 +94,8 @@
     # Mysqlx.Crud
     for key, val in mysqlx_crud_pb2.DataModel.items():
         _MESSAGES["Mysqlx.Crud.DataModel.{0}".format(key)] = val
+    for key, val in mysqlx_crud_pb2.Find.RowLock.items():
+        _MESSAGES["Mysqlx.Crud.Find.RowLock.{0}".format(key)] = val
     for key, val in mysqlx_crud_pb2.Order.Direction.items():
         _MESSAGES["Mysqlx.Crud.Order.Direction.{0}".format(key)] = val
     for key, val in mysqlx_crud_pb2.UpdateOperation.UpdateType.items():
@@ -230,8 +233,12 @@ def __setattr__(self, name, value):
             self._msg[name] = value.get_message() \
                 if isinstance(value, Message) else value
         else:
-            if isinstance(value, (NUMERIC_TYPES, STRING_TYPES, BYTE_TYPES)):
+            if PY3 and isinstance(value, STRING_TYPES):
+                setattr(self._msg, name, encode_to_bytes(value))
+            elif isinstance(value, (NUMERIC_TYPES, STRING_TYPES, BYTE_TYPES)):
                 setattr(self._msg, name, value)
+            elif isinstance(value, list):
+                getattr(self._msg, name).extend(value)
             elif isinstance(value, Message):
                 getattr(self._msg, name).MergeFrom(value.get_message())
             else:

lib/mysqlx/protobuf/__init__.py

@@ -605,10 +605,10 @@ def __getitem__(self, index):
         return self._fields[index]
 
     def get_string(self, str_index):
-        """Returns the value if the index by string.
+        """Returns the value using the column name.
 
         Args:
-            str_index (str): The string index.
+            str_index (str): The column name.
         """
         int_index = self._resultset.index_of(str_index)
         if int_index >= len(self._fields):

lib/mysqlx/protobuf/mysqlx_crud_pb2.py

@@ -1163,6 +1163,11 @@ def test_find(self):
         docs = result.fetch_all()
         self.assertTrue("$.age + 100" in docs[0].keys())
 
+        # tests comma seperated fields
+        result = collection.find("$.age = 21").fields("$.age, $.name").execute()
+        docs = result.fetch_all()
+        self.assertEqual("Fred", docs[0]['$.name'])
+
         self.schema.drop_collection(collection_name)
 
     def test_modify(self):