added unit tests for dbapi module

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

@@ -51,6 +51,7 @@
     ITERATOR_ALL
 )
 from tarantool.error import (
+    Error,
     NetworkError,
     DatabaseError,
     InterfaceError,
@@ -85,7 +86,7 @@ class Connection(object):
     (insert/delete/update/select).
     '''
     # DBAPI Extension: supply exceptions as attributes on the connection
-    Error = tarantool.error
+    Error = Error
     DatabaseError = DatabaseError
     InterfaceError = InterfaceError
     SchemaError = SchemaError
@@ -108,6 +109,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.
@@ -140,6 +142,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
@@ -277,7 +280,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)
@@ -461,7 +464,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
@@ -475,7 +478,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
@@ -504,7 +507,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

tarantool/dbapi.py

@@ -6,20 +6,21 @@
 from tarantool.error import InterfaceError
 from .connection import Connection as BaseConnection
 
-update_insert_pattern = re.compile(r'^UPDATE|INSERT')
+update_insert_pattern = re.compile(r'^UPDATE|^INSERT', re.IGNORECASE)
 
 
 class Cursor:
     _lastrowid = 0
     _rowcount = 0
     description = None
     position = 0
-    arraysize = 200
+    arraysize = 1
     autocommit = True
+    closed = False
 
     def __init__(self, connection):
         self._c = connection
-        self.rows = []
+        self.rows = None
 
     def callproc(self, procname, *params):  # TODO
         """
@@ -48,6 +49,8 @@ def _convert_param(p):
             return "NULL"
         if isinstance(p, bool):
             return str(p)
+        if isinstance(p, str):
+            return "'%s'" % p.replace("'", "''")
         return "'%s'" % p
 
     @staticmethod
@@ -85,29 +88,37 @@ def execute(self, query, params=None):
 
         Return values are not defined.
         """
+        if self.closed:
+            raise self._c.ProgrammingError
         if params:
             query = query % tuple(
                 self._convert_param(param) for param in params)
 
         response = self._c.execute(query)
 
         self.rows = tuple(response.body.values())[1] if len(
-            response.body) > 1 else []
+            response.body) > 1 else None
 
-        if update_insert_pattern.match(query.upper()):
+        if update_insert_pattern.match(query):
             try:
                 self._rowcount = response.rowcount
             except InterfaceError:
-                self._rowcount = 1
+                self._rowcount = -1
         else:
-            self._rowcount = 1
+            self._rowcount = -1
 
         if query.upper().startswith('INSERT'):
             self._lastrowid = self._extract_last_row_id(response.body)
         return response
 
-    def executemany(self, query, params):
-        return self.execute(query, params)
+    def executemany(self, query, param_sets):
+        rowcounts = []
+        for params in param_sets:
+            self.execute(query, params)
+            rowcounts.append(self.rowcount)
+
+        self._rowcount = -1 if -1 in rowcounts else sum(rowcounts)
+        return self
 
     @property
     def lastrowid(self):
@@ -150,10 +161,11 @@ def fetchone(self):
         An Error (or subclass) exception is raised if the previous call to
         .execute*() did not produce any result set or no call was issued yet.
         """
-
+        if self.rows is None:
+            raise self._c.Error
         return self.fetchmany(1)[0] if len(self.rows) else None
 
-    def fetchmany(self, size):
+    def fetchmany(self, size=None):
         """
         Fetch the next set of rows of a query result, returning a sequence of
         sequences (e.g. a list of tuples). An empty sequence is returned when
@@ -174,6 +186,11 @@ def fetchmany(self, size):
         .arraysize attribute. If the size parameter is used, then it is best
         for it to retain the same value from one .fetchmany() call to the next.
         """
+        size = size or self.arraysize
+
+        if self.rows is None:
+            raise self._c.ProgrammingError
+
         if len(self.rows) < size:
             items = self.rows
             self.rows = []
@@ -190,6 +207,9 @@ def fetchall(self):
         An Error (or subclass) exception is raised if the previous call to
         .execute*() did not produce any result set or no call was issued yet.
         """
+        if self.rows is None:
+            raise self._c.ProgrammingError
+
         items = self.rows[:]
         self.rows = []
         return items
@@ -216,10 +236,17 @@ def setoutputsize(self, size, column=None):
 
 class Connection(BaseConnection):
     _cursor = None
+    paramstyle = 'format'
+    apilevel = "2.0"
+    threadsafety = 0
 
     server_version = 2
 
-    def commit(self):  # TODO
+    def connect(self):
+        super().connect()
+        return self
+
+    def commit(self):
         """
         Commit any pending transaction to the database.
 
@@ -230,6 +257,8 @@ def commit(self):  # TODO
         Database modules that do not support transactions should implement
         this method with void functionality.
         """
+        if self._socket is None:
+            raise self.ProgrammingError
 
     def rollback(self):
         """
@@ -238,6 +267,13 @@ def rollback(self):
         Closing a connection without committing the changes first will cause
         an implicit rollback to be performed.
         """
+        if self._socket is None:
+            raise self.ProgrammingError
+
+    def execute(self, query, params=None):
+        if self._socket is None:
+            raise self.ProgrammingError
+        return super().execute(query, params)
 
     def close(self):
         """
@@ -252,6 +288,8 @@ def close(self):
         if self._socket:
             self._socket.close()
             self._socket = None
+        else:
+            raise self.ProgrammingError
 
     def _set_cursor(self):
         self._cursor = Cursor(self)

test.sh

@@ -3,15 +3,11 @@
 set -exu # Strict shell (w/o -o pipefail)
 
 # Install tarantool.
-curl http://download.tarantool.org/tarantool/2x/gpgkey | sudo apt-key add -
-release=`lsb_release -c -s`
-echo "deb http://download.tarantool.org/tarantool/2x/ubuntu/ ${release} main" | sudo tee /etc/apt/sources.list.d/tarantool_2x.list
-sudo apt-get update > /dev/null
-sudo apt-get -q -y install tarantool
+curl -L https://tarantool.io/installer.sh | VER=2.4 bash
 
 # Install testing dependencies.
 pip install -r requirements.txt
-pip install pyyaml
+pip install pyyaml dbapi-compliance==1.15.0
 
 # Run tests.
 python setup.py test

unit/suites/__init__.py

@@ -9,9 +9,10 @@
 from .test_protocol import TestSuite_Protocol
 from .test_reconnect import TestSuite_Reconnect
 from .test_mesh import TestSuite_Mesh
+from .test_dbapi import TestSuite_DBAPI
 
 test_cases = (TestSuite_Schema, TestSuite_Request, TestSuite_Protocol,
-              TestSuite_Reconnect, TestSuite_Mesh)
+              TestSuite_Reconnect, TestSuite_Mesh, TestSuite_DBAPI)
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()

unit/suites/box_dbapi.lua

@@ -0,0 +1,10 @@
+#!/usr/bin/env tarantool
+os = require('os')
+
+require('console').listen(os.getenv("ADMIN_PORT"))
+box.cfg {
+   listen = os.getenv("PRIMARY_PORT"),
+   memtx_memory = 0.1 * 1024 ^ 3, -- 0.1 GiB
+   pid_file = "box.pid",
+}
+box.schema.user.grant('guest', 'create,read,write', 'universe')

unit/suites/test_dbapi.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import print_function
+
+import sys
+import unittest
+
+from dbapi20 import DatabaseAPI20Test
+
+from tarantool.dbapi import Connection
+from .lib.tarantool_server import TarantoolServer
+
+
+class TestSuite_DBAPI(DatabaseAPI20Test):
+    table_prefix = 'dbapi20test_'  # If you need to specify a prefix for tables
+
+    ddl1 = 'create table %sbooze (name varchar(20) primary key)' % table_prefix
+    ddl2 = 'create table %sbarflys (name varchar(20) primary key, ' \
+           'drink varchar(30))' % table_prefix
+
+    @classmethod
+    def setUpClass(cls):
+        print(' DBAPI '.center(70, '='), file=sys.stderr)
+        print('-' * 70, file=sys.stderr)
+
+    def setUp(self):
+        self.srv = TarantoolServer()
+        self.srv.script = 'unit/suites/box_dbapi.lua'
+        self.srv.start()
+        self.driver = Connection(self.srv.host, self.srv.args['primary'])
+        # prevent a remote tarantool from clean our session
+        if self.srv.is_started():
+            self.srv.touch_lock()
+
+    def tearDown(self):
+        # self.driver.close()
+        self.srv.stop()
+        self.srv.clean()
+
+    @unittest.skip('Not implemented')
+    def test_Binary(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_STRING(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_BINARY(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_NUMBER(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_DATETIME(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_ROWID(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_Date(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_Time(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_Timestamp(self):
+        pass
+
+    @unittest.skip('Not implemented as optional.')
+    def test_nextset(self):
+        pass
+
+    @unittest.skip('To do')
+    def test_callproc(self):
+        pass
+
+    @unittest.skip('To do')
+    def test_setoutputsize(self):
+        pass
+
+    @unittest.skip('To do')
+    def test_description(self):
+        pass
+
+    @unittest.skip('To do')
+    def test_close(self):
+        pass