diff --git a/test/Connection.py b/test/Connection.py index de138d5..eb1ebab 100644 --- a/test/Connection.py +++ b/test/Connection.py @@ -76,13 +76,13 @@ class TestConnection(TestCase): connection = cx_Oracle.connect(self.username, self.password, self.tnsentry) cursor = connection.cursor() - cursor.execute("truncate table TestExecuteMany") + cursor.execute("truncate table TestTempTable") otherConnection = cx_Oracle.connect(self.username, self.password, self.tnsentry) otherCursor = otherConnection.cursor() - otherCursor.execute("insert into TestExecuteMany (IntCol) values (1)") + otherCursor.execute("insert into TestTempTable (IntCol) values (1)") otherConnection.close() - cursor.execute("select count(*) from TestExecuteMany") + cursor.execute("select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) @@ -91,14 +91,14 @@ class TestConnection(TestCase): connection = cx_Oracle.connect(self.username, self.password, self.tnsentry) cursor = connection.cursor() - cursor.execute("truncate table TestExecuteMany") + cursor.execute("truncate table TestTempTable") otherConnection = cx_Oracle.connect(self.username, self.password, self.tnsentry) otherCursor = otherConnection.cursor() - otherCursor.execute("insert into TestExecuteMany (IntCol) values (1)") + otherCursor.execute("insert into TestTempTable (IntCol) values (1)") del otherCursor del otherConnection - cursor.execute("select count(*) from TestExecuteMany") + cursor.execute("select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) diff --git a/test/Cursor.py b/test/Cursor.py index 4051856..1974b22 100644 --- a/test/Cursor.py +++ b/test/Cursor.py @@ -88,57 +88,57 @@ class TestCursor(BaseTestCase): def testExecuteManyByName(self): """test executing a statement multiple times (named args)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ { "value" : n } for n in range(250) ] self.cursor.arraysize = 100 - statement = "insert into TestExecuteMany (IntCol) values (:value)" + statement = "insert into TestTempTable (IntCol) values (:value)" self.cursor.executemany(statement, rows) self.connection.commit() - self.cursor.execute("select count(*) from TestExecuteMany") + self.cursor.execute("select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyByPosition(self): """test executing a statement multiple times (positional args)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ [n] for n in range(230) ] self.cursor.arraysize = 100 - statement = "insert into TestExecuteMany (IntCol) values (:1)" + statement = "insert into TestTempTable (IntCol) values (:1)" self.cursor.executemany(statement, rows) self.connection.commit() - self.cursor.execute("select count(*) from TestExecuteMany") + self.cursor.execute("select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithPrepare(self): """test executing a statement multiple times (with prepare)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ [n] for n in range(225) ] self.cursor.arraysize = 100 - statement = "insert into TestExecuteMany (IntCol) values (:1)" + statement = "insert into TestTempTable (IntCol) values (:1)" self.cursor.prepare(statement) self.cursor.executemany(None, rows) self.connection.commit() - self.cursor.execute("select count(*) from TestExecuteMany") + self.cursor.execute("select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithRebind(self): """test executing a statement multiple times (with rebind)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ [n] for n in range(235) ] self.cursor.arraysize = 100 - statement = "insert into TestExecuteMany (IntCol) values (:1)" + statement = "insert into TestTempTable (IntCol) values (:1)" self.cursor.executemany(statement, rows[:50]) self.cursor.executemany(statement, rows[50:]) self.connection.commit() - self.cursor.execute("select count(*) from TestExecuteMany") + self.cursor.execute("select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithResize(self): """test executing a statement multiple times (with resize)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ ( 1, "First" ), ( 2, "Second" ), ( 3, "Third" ), @@ -148,10 +148,10 @@ class TestCursor(BaseTestCase): ( 7, "Seventh" ) ] self.cursor.bindarraysize = 5 self.cursor.setinputsizes(int, 100) - sql = "insert into TestExecuteMany (IntCol, StringCol) values (:1, :2)" + sql = "insert into TestTempTable (IntCol, StringCol) values (:1, :2)" self.cursor.executemany(sql, rows) var = self.cursor.bindvars[1] - self.cursor.execute("select count(*) from TestExecuteMany") + self.cursor.execute("select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) self.assertEqual(var.bufferSize, @@ -159,9 +159,9 @@ class TestCursor(BaseTestCase): def testExecuteManyWithExecption(self): """test executing a statement multiple times (with exception)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") rows = [ { "value" : n } for n in (1, 2, 3, 2, 5) ] - statement = "insert into TestExecuteMany (IntCol) values (:value)" + statement = "insert into TestTempTable (IntCol) values (:value)" self.assertRaises(cx_Oracle.DatabaseError, self.cursor.executemany, statement, rows) self.assertEqual(self.cursor.rowcount, 3) @@ -201,7 +201,7 @@ class TestCursor(BaseTestCase): def testIteratorsInterrupted(self): """test iterators (with intermediate execute)""" - self.cursor.execute("truncate table TestExecuteMany") + self.cursor.execute("truncate table TestTempTable") self.cursor.execute(""" select IntCol from TestNumbers @@ -212,7 +212,7 @@ class TestCursor(BaseTestCase): value, = next(testIter) else: value, = testIter.next() - self.cursor.execute("insert into TestExecuteMany (IntCol) values (1)") + self.cursor.execute("insert into TestTempTable (IntCol) values (1)") if sys.version_info[0] >= 3: self.assertRaises(cx_Oracle.InterfaceError, next, testIter) else: diff --git a/test/SessionPool.py b/test/SessionPool.py index 2f1b900..16fc75e 100644 --- a/test/SessionPool.py +++ b/test/SessionPool.py @@ -66,12 +66,12 @@ class TestConnection(TestCase): pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute("truncate table TestExecuteMany") - cursor.execute("insert into TestExecuteMany (IntCol) values (1)") + cursor.execute("truncate table TestTempTable") + cursor.execute("insert into TestTempTable (IntCol) values (1)") pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute("select count(*) from TestExecuteMany") + cursor.execute("select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) @@ -80,13 +80,13 @@ class TestConnection(TestCase): pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute("truncate table TestExecuteMany") - cursor.execute("insert into TestExecuteMany (IntCol) values (1)") + cursor.execute("truncate table TestTempTable") + cursor.execute("insert into TestTempTable (IntCol) values (1)") pool.release(connection) pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute("select count(*) from TestExecuteMany") + cursor.execute("select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) diff --git a/test/SetupTest.sql b/test/SetupTest.sql index 04d4d61..f731d4b 100644 --- a/test/SetupTest.sql +++ b/test/SetupTest.sql @@ -116,10 +116,10 @@ create table cx_Oracle.TestLongRaws ( LongRawCol long raw not null ) tablespace users; -create table cx_Oracle.TestExecuteMany ( +create table cx_Oracle.TestTempTable ( IntCol number(9) not null, StringCol varchar2(100), - constraint TestExecuteMany_pk primary key (IntCol) + constraint TestTempTable_pk primary key (IntCol) using index tablespace users ) tablespace users; diff --git a/test/uConnection.py b/test/uConnection.py index d7d8124..91fb33e 100644 --- a/test/uConnection.py +++ b/test/uConnection.py @@ -76,13 +76,13 @@ class TestConnection(TestCase): connection = cx_Oracle.connect(self.username, self.password, self.tnsentry) cursor = connection.cursor() - cursor.execute(u"truncate table TestExecuteMany") + cursor.execute(u"truncate table TestTempTable") otherConnection = cx_Oracle.connect(self.username, self.password, self.tnsentry) otherCursor = otherConnection.cursor() - otherCursor.execute(u"insert into TestExecuteMany (IntCol) values (1)") + otherCursor.execute(u"insert into TestTempTable (IntCol) values (1)") otherConnection.close() - cursor.execute(u"select count(*) from TestExecuteMany") + cursor.execute(u"select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) @@ -91,14 +91,14 @@ class TestConnection(TestCase): connection = cx_Oracle.connect(self.username, self.password, self.tnsentry) cursor = connection.cursor() - cursor.execute(u"truncate table TestExecuteMany") + cursor.execute(u"truncate table TestTempTable") otherConnection = cx_Oracle.connect(self.username, self.password, self.tnsentry) otherCursor = otherConnection.cursor() - otherCursor.execute(u"insert into TestExecuteMany (IntCol) values (1)") + otherCursor.execute(u"insert into TestTempTable (IntCol) values (1)") del otherCursor del otherConnection - cursor.execute(u"select count(*) from TestExecuteMany") + cursor.execute(u"select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) diff --git a/test/uCursor.py b/test/uCursor.py index 3657d40..ec0a6e6 100644 --- a/test/uCursor.py +++ b/test/uCursor.py @@ -76,59 +76,59 @@ class TestCursor(BaseTestCase): def testExecuteManyByName(self): """test executing a statement multiple times (named args)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") rows = [ { u"value" : n } for n in range(250) ] self.cursor.arraysize = 100 - statement = u"insert into TestExecuteMany (IntCol) values (:value)" + statement = u"insert into TestTempTable (IntCol) values (:value)" self.cursor.executemany(statement, rows) self.connection.commit() - self.cursor.execute(u"select count(*) from TestExecuteMany") + self.cursor.execute(u"select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyByPosition(self): """test executing a statement multiple times (positional args)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") rows = [ [n] for n in range(230) ] self.cursor.arraysize = 100 - statement = u"insert into TestExecuteMany (IntCol) values (:1)" + statement = u"insert into TestTempTable (IntCol) values (:1)" self.cursor.executemany(statement, rows) self.connection.commit() - self.cursor.execute(u"select count(*) from TestExecuteMany") + self.cursor.execute(u"select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithPrepare(self): """test executing a statement multiple times (with prepare)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") rows = [ [n] for n in range(225) ] self.cursor.arraysize = 100 - statement = u"insert into TestExecuteMany (IntCol) values (:1)" + statement = u"insert into TestTempTable (IntCol) values (:1)" self.cursor.prepare(statement) self.cursor.executemany(None, rows) self.connection.commit() - self.cursor.execute(u"select count(*) from TestExecuteMany") + self.cursor.execute(u"select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithRebind(self): """test executing a statement multiple times (with rebind)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") rows = [ [n] for n in range(235) ] self.cursor.arraysize = 100 - statement = u"insert into TestExecuteMany (IntCol) values (:1)" + statement = u"insert into TestTempTable (IntCol) values (:1)" self.cursor.executemany(statement, rows[:50]) self.cursor.executemany(statement, rows[50:]) self.connection.commit() - self.cursor.execute(u"select count(*) from TestExecuteMany") + self.cursor.execute(u"select count(*) from TestTempTable") count, = self.cursor.fetchone() self.assertEqual(count, len(rows)) def testExecuteManyWithExecption(self): """test executing a statement multiple times (with exception)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") rows = [ { u"value" : n } for n in (1, 2, 3, 2, 5) ] - statement = u"insert into TestExecuteMany (IntCol) values (:value)" + statement = u"insert into TestTempTable (IntCol) values (:value)" self.assertRaises(cx_Oracle.DatabaseError, self.cursor.executemany, statement, rows) self.assertEqual(self.cursor.rowcount, 3) @@ -168,7 +168,7 @@ class TestCursor(BaseTestCase): def testIteratorsInterrupted(self): """test iterators (with intermediate execute)""" - self.cursor.execute(u"truncate table TestExecuteMany") + self.cursor.execute(u"truncate table TestTempTable") self.cursor.execute(u""" select IntCol from TestNumbers @@ -176,7 +176,7 @@ class TestCursor(BaseTestCase): order by IntCol""") testIter = iter(self.cursor) value, = testIter.next() - self.cursor.execute(u"insert into TestExecuteMany (IntCol) values (1)") + self.cursor.execute(u"insert into TestTempTable (IntCol) values (1)") self.assertRaises(cx_Oracle.InterfaceError, testIter.next) def testBindNames(self): diff --git a/test/uSessionPool.py b/test/uSessionPool.py index 3970537..df8502e 100644 --- a/test/uSessionPool.py +++ b/test/uSessionPool.py @@ -59,12 +59,12 @@ class TestConnection(TestCase): pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute(u"truncate table TestExecuteMany") - cursor.execute(u"insert into TestExecuteMany (IntCol) values (1)") + cursor.execute(u"truncate table TestTempTable") + cursor.execute(u"insert into TestTempTable (IntCol) values (1)") pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute(u"select count(*) from TestExecuteMany") + cursor.execute(u"select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0) @@ -73,13 +73,13 @@ class TestConnection(TestCase): pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute(u"truncate table TestExecuteMany") - cursor.execute(u"insert into TestExecuteMany (IntCol) values (1)") + cursor.execute(u"truncate table TestTempTable") + cursor.execute(u"insert into TestTempTable (IntCol) values (1)") pool.release(connection) pool = cx_Oracle.SessionPool(USERNAME, PASSWORD, TNSENTRY, 1, 8, 3) connection = pool.acquire() cursor = connection.cursor() - cursor.execute(u"select count(*) from TestExecuteMany") + cursor.execute(u"select count(*) from TestTempTable") count, = cursor.fetchone() self.assertEqual(count, 0)