Briq
/
jaydebeapi
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix with statment test. Include missing PropertiesDriverArgsPassingTest

master
baztian 2020-05-27 21:45:58 +02:00
parent fd38216c4d
commit 8191a24489
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -96,7 +96,7 @@ Here is an example:
>>> curs = conn.cursor() >>> curs = conn.cursor()
>>> curs.execute('create table CUSTOMER' >>> curs.execute('create table CUSTOMER'
... '("CUST_ID" INTEGER not null,' ... '("CUST_ID" INTEGER not null,'
... ' "NAME" VARCHAR not null,' ... ' "NAME" VARCHAR(50) not null,'
... ' primary key ("CUST_ID"))' ... ' primary key ("CUST_ID"))'
... ) ... )
>>> curs.execute("insert into CUSTOMER values (1, 'John')") >>> curs.execute("insert into CUSTOMER values (1, 'John')")

38
test/test_integration.py
View File

@ -207,17 +207,6 @@ class IntegrationTestBase(object):
cursor.execute("select * from ACCOUNT") cursor.execute("select * from ACCOUNT")
self.assertEqual(cursor.rowcount, -1) self.assertEqual(cursor.rowcount, -1)
def test_connection_with_statement(self):
with self.connect() as conn:
self.assertEqual(conn._closed, False)
self.assertEqual(conn._closed, True)
def test_cursor_with_statement(self):
with self.conn.cursor() as cursor:
cursor.execute("select 1 from ACCOUNT")
self.assertIsNotNone(cursor._connection)
self.assertIsNone(cursor._connection)
class SqliteTestBase(IntegrationTestBase): class SqliteTestBase(IntegrationTestBase):
def setUpSql(self): def setUpSql(self):
@ -293,10 +282,33 @@ class PropertiesDriverArgsPassingTest(unittest.TestCase):
driver, url, driver_args = ( 'org.hsqldb.jdbcDriver', driver, url, driver_args = ( 'org.hsqldb.jdbcDriver',
'jdbc:hsqldb:mem:.', 'jdbc:hsqldb:mem:.',
['SA', ''] ) ['SA', ''] )
jaydebeapi.connect(driver, url, driver_args) c = jaydebeapi.connect(driver, url, driver_args)
c.close()
def test_connect_with_properties(self): def test_connect_with_properties(self):
driver, url, driver_args = ( 'org.hsqldb.jdbcDriver', driver, url, driver_args = ( 'org.hsqldb.jdbcDriver',
'jdbc:hsqldb:mem:.', 'jdbc:hsqldb:mem:.',
{'user': 'SA', 'password': '' } ) {'user': 'SA', 'password': '' } )
jaydebeapi.connect(driver, url, driver_args) c = jaydebeapi.connect(driver, url, driver_args)
c.close()
class WithStatementTest(unittest.TestCase):
def test_connection_with_statement(self):
driver, url, driver_args = ( 'org.hsqldb.jdbcDriver',
'jdbc:hsqldb:mem:.',
['SA', ''] )
with jaydebeapi.connect(driver, url, driver_args) as conn:
self.assertEqual(conn._closed, False)
self.assertEqual(conn._closed, True)
def test_cursor_with_statement(self):
driver, url, driver_args = ( 'org.hsqldb.jdbcDriver',
'jdbc:hsqldb:mem:.',
{'user': 'SA', 'password': '' } )
c = jaydebeapi.connect(driver, url, driver_args)
with c.cursor() as cursor:
cursor.execute("CALL \"java.lang.Math.sqrt\"(2.0)")
self.assertIsNotNone(cursor._connection)
self.assertIsNone(cursor._connection)

2
tox.ini
View File

@ -14,7 +14,7 @@ whitelist_externals = mvn
setenv = setenv =
CLASSPATH = {envdir}/javalib/* CLASSPATH = {envdir}/javalib/*
driver-mock: TESTNAME=test_mock driver-mock: TESTNAME=test_mock
driver-hsqldb: TESTNAME=test_integration.HsqldbTest driver-hsqldb: TESTNAME=test_integration.HsqldbTest test_integration.WithStatementTest test_integration.PropertiesDriverArgsPassingTest
driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest
driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
deps = deps =