Dbapi2 (#160)

* added dbapi2 errors and extended Cursor and Connection functionality

* disable quoting for boolean query params

* updated connection and response

* workaround for update and insert

* workaround for lastrowid

* implemented fetchone logic

* minor changes

* minor changes and added dbapi2 descriptions

* set use_list to False for Response object

* created Cursor and Connection classes

Co-authored-by: Denis Ignatenko <[email protected]>

Author: artembo

tarantool/__init__.py

@@ -75,4 +75,4 @@ def connectmesh(addrs=({'host': 'localhost', 'port': 3301},), user=None,
 
 __all__ = ['connect', 'Connection', 'connectmesh', 'MeshConnection', 'Schema',
            'Error', 'DatabaseError', 'NetworkError', 'NetworkWarning',
-           'SchemaError']
+           'SchemaError', 'dbapi']

tarantool/connection.py

@@ -11,6 +11,7 @@
 
 import ctypes
 import ctypes.util
+
 try:
     from ctypes import c_ssize_t
 except ImportError:
@@ -50,12 +51,20 @@
     ITERATOR_ALL
 )
 from tarantool.error import (
+    Error,
     NetworkError,
     DatabaseError,
     InterfaceError,
     SchemaError,
     NetworkWarning,
+    OperationalError,
+    DataError,
+    IntegrityError,
+    InternalError,
+    ProgrammingError,
+    NotSupportedError,
     SchemaReloadException,
+    Warning,
     warn
 )
 from tarantool.schema import Schema
@@ -77,11 +86,20 @@ class Connection(object):
     Also this class provides low-level interface to data manipulation
     (insert/delete/update/select).
     '''
-    Error = tarantool.error
+    # DBAPI Extension: supply exceptions as attributes on the connection
+    Error = Error
     DatabaseError = DatabaseError
     InterfaceError = InterfaceError
     SchemaError = SchemaError
     NetworkError = NetworkError
+    Warning = Warning
+    DataError = DataError
+    OperationalError = OperationalError
+    IntegrityError = IntegrityError
+    InternalError = InternalError
+    ProgrammingError = ProgrammingError
+    NotSupportedError = NotSupportedError
+    ImproperlyConfigured = Exception
 
     def __init__(self, host, port,
                  user=None,
@@ -92,6 +110,7 @@ def __init__(self, host, port,
                  connect_now=True,
                  encoding=ENCODING_DEFAULT,
                  call_16=False,
+                 use_list=True,
                  connection_timeout=CONNECTION_TIMEOUT):
         '''
         Initialize a connection to the server.
@@ -124,6 +143,7 @@ def __init__(self, host, port,
         self._socket = None
         self.connected = False
         self.error = True
+        self.use_list = use_list
         self.encoding = encoding
         self.call_16 = call_16
         self.connection_timeout = connection_timeout
@@ -261,7 +281,7 @@ def _send_request_wo_reconnect(self, request):
         while True:
             try:
                 self._socket.sendall(bytes(request))
-                response = Response(self, self._read_response())
+                response = Response(self, self._read_response(), self.use_list)
                 break
             except SchemaReloadException as e:
                 self.update_schema(e.schema_version)
@@ -293,13 +313,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
@@ -446,7 +465,7 @@ def _join_v16(self, server_uuid):
         self._socket.sendall(bytes(request))
 
         while True:
-            resp = Response(self, self._read_response())
+            resp = Response(self, self._read_response(), self.use_list)
             yield resp
             if resp.code == REQUEST_TYPE_OK or resp.code >= REQUEST_TYPE_ERROR:
                 return
@@ -460,7 +479,7 @@ class JoinState:
         self._socket.sendall(bytes(request))
         state = JoinState.Handshake
         while True:
-            resp = Response(self, self._read_response())
+            resp = Response(self, self._read_response(), self.use_list)
             yield resp
             if resp.code >= REQUEST_TYPE_ERROR:
                 return
@@ -489,7 +508,7 @@ def subscribe(self, cluster_uuid, server_uuid, vclock=None):
         request = RequestSubscribe(self, cluster_uuid, server_uuid, vclock)
         self._socket.sendall(bytes(request))
         while True:
-            resp = Response(self, self._read_response())
+            resp = Response(self, self._read_response(), self.use_list)
             yield resp
             if resp.code >= REQUEST_TYPE_ERROR:
                 return
@@ -791,10 +810,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