updated connection and response

Author: artembo

tarantool/connection.py

@@ -11,6 +11,7 @@
 
 import ctypes
 import ctypes.util
+
 try:
     from ctypes import c_ssize_t
 except ImportError:
@@ -293,13 +294,12 @@ def check():  # Check that connection is alive
                 retbytes = self._sys_recv(sock_fd, buf, 1, flag)
 
                 err = 0
-                if os.name!= 'nt':
+                if os.name != 'nt':
                     err = ctypes.get_errno()
                 else:
                     err = ctypes.get_last_error()
                     self._socket.setblocking(True)
 
-
                 WWSAEWOULDBLOCK = 10035
                 if (retbytes < 0) and (err == errno.EAGAIN or
                                        err == errno.EWOULDBLOCK or
@@ -791,10 +791,10 @@ def execute(self, query, params=None):
         '''
         Execute SQL request.
         Execute SQL query in database. 
-        
-        :param query: SQL syntax query 
+
+        :param query: SQL syntax query
         :type query: str
-        
+
         :param params: Bind values to use in query
         :type params: list, dict
 

tarantool/dbapi.py

@@ -1,6 +1,9 @@
 """
 Supports python 3.6 and above
 """
+from copy import deepcopy
+
+from tarantool.error import InterfaceError
 
 from .connection import Connection as BaseConnection
 from . import error
@@ -13,6 +16,7 @@ class Cursor:
     rows = []
     position = 0
     autocommit = True
+    _rowcount = 0
 
     def __init__(self, connection):
         self._c = connection
@@ -31,14 +35,23 @@ def execute(self, query, params=None):
 
         if len(response.body) > 1:
             self.rows = tuple(response.body.values())[1]
+        else:
+            self.rows = []
+        if 'UPDATE' not in query or 'INSERT' not in query:
+            try:
+                self._rowcount = response.rowcount
+            except InterfaceError:
+                pass
+        else:
+            self._rowcount = 1
         return response
 
     def lastrowid(self):
         return self._lastrowid
 
     @property
     def rowcount(self):
-        return len(self._c.rows)
+        return self._rowcount
 
     def executemany(self, query, params):
         return self.execute(query, params)
@@ -48,7 +61,7 @@ def fetchone(self):
 
     def fetchmany(self, size):
         self._lastrowid += size
-        items = self.rows.copy()
+        items = deepcopy(self.rows)
         self.rows = []
         return items
 

tarantool/request.py

@@ -7,7 +7,6 @@
 import msgpack
 import hashlib
 
-
 from tarantool.const import (
     IPROTO_CODE,
     IPROTO_SYNC,
@@ -50,6 +49,7 @@
     binary_types
 )
 
+
 class Request(object):
     '''
     Represents a single request to the server in compliance with the
@@ -137,7 +137,7 @@ def sha1(values):
         request_body = msgpack.dumps({IPROTO_USER_NAME: user,
                                       IPROTO_TUPLE: ("chap-sha1", scramble)})
         self._body = request_body
-    
+
     def header(self, length):
         self._sync = self.conn.generate_sync()
         # Set IPROTO_SCHEMA_ID: 0 to avoid SchemaReloadException

tarantool/response.py

@@ -35,7 +35,7 @@ class Response(Sequence):
     and parses binary packet received from the server.
     '''
 
-    def __init__(self, conn, response):
+    def __init__(self, conn, response, use_list=False):
         '''
         Create an instance of `Response` using data received from the server.
 
@@ -54,11 +54,11 @@ def __init__(self, conn, response):
             # Get rid of the following warning.
             # > PendingDeprecationWarning: encoding is deprecated,
             # > Use raw=False instead.
-            unpacker = msgpack.Unpacker(use_list=True, raw=False)
+            unpacker = msgpack.Unpacker(use_list=use_list, raw=False)
         elif conn.encoding is not None:
-            unpacker = msgpack.Unpacker(use_list=True, encoding=conn.encoding)
+            unpacker = msgpack.Unpacker(use_list=use_list, encoding=conn.encoding)
         else:
-            unpacker = msgpack.Unpacker(use_list=True)
+            unpacker = msgpack.Unpacker(use_list=use_list)
 
         unpacker.feed(response)
         header = unpacker.unpack()