Merge branch 'release/2.2.0' of myrepo.no.oracle.com:connector-python into release/2.2.0

Reggie Burnett · Reggie Burnett · commit 27b5381844b7 · 2016-06-02T12:20:16.000-05:00
diff --git a/cpyint b/cpyint
@@ -1 +1 @@
-Subproject commit 9c9fdb17c8c8053d73bd94acc684c7304c0f9853
+Subproject commit 96219b0db7a882fae29adbe22a9e2fe0bb1717ae
diff --git a/lib/mysqlx/__init__.py b/lib/mysqlx/__init__.py
@@ -31,7 +31,9 @@
 from .result import (ColumnMetaData, Row, Result, BufferingResult, RowResult,
                      SqlResult)
 from .statement import (Statement, FilterableStatement, SqlStatement,
-                        AddStatement, RemoveStatement, TableDeleteStatement)
+                        AddStatement, RemoveStatement, TableDeleteStatement,
+                        CreateCollectionIndexStatement,
+                        DropCollectionIndexStatement)
 from .dbdoc import DbDoc
 
 
@@ -62,4 +64,5 @@ def get_node_session(settings):
     # mysqlx.statement
     "DbDoc", "Statement", "FilterableStatement", "SqlStatement",
     "AddStatement", "RemoveStatement", "TableDeleteStatement",
+    "CreateCollectionIndexStatement", "DropCollectionIndexStatement",
 ]
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -204,7 +204,7 @@ def execute(self):
         """Execute the Statement.
 
         Returns:
-            mysqlx.Result
+            mysqlx.Result: Result object
         """
         fields = [item for sublist in self._fields for item in sublist]
         return self._connection.execute_nonquery(
