Update ODPI-C which has added an optimization to reduce buffer size when both

the client and server character sets are identical and corrected support for
BFILE LOBs.

Author: anthony-tuininga

odpi

@@ -23,7 +23,8 @@ def testBindCursor(self):
                 end;""",
                 cursor = cursor)
         self.assertEqual(cursor.description,
-                [ ('STRINGVALUE', cx_Oracle.FIXED_CHAR, 1, 4, None, None, 1) ])
+                [ ('STRINGVALUE', cx_Oracle.FIXED_CHAR, 1, CS_RATIO, None,
+                    None, 1) ])
         self.assertEqual(cursor.fetchall(), [('X',)])
 
     def testBindCursorInPackage(self):
@@ -33,7 +34,8 @@ def testBindCursorInPackage(self):
         self.cursor.callproc("pkg_TestOutCursors.TestOutCursor", (2, cursor))
         self.assertEqual(cursor.description,
                 [ ('INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
-                  ('STRINGCOL', cx_Oracle.STRING, 20, 80, None, None, 0) ])
+                  ('STRINGCOL', cx_Oracle.STRING, 20, 20 * CS_RATIO, None,
+                    None, 0) ])
         self.assertEqual(cursor.fetchall(),
                 [ (1, 'String 1'), (2, 'String 2') ])
 

test/CursorVar.py

@@ -279,11 +279,13 @@ def testCursorDescription(self):
         self.cursor.execute("select * from TestStrings")
         self.assertEqual(self.cursor.description,
                 [ ('INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
-                  ('STRINGCOL', cx_Oracle.STRING, 20, 80, None, None, 0),
+                  ('STRINGCOL', cx_Oracle.STRING, 20, 20 * CS_RATIO, None,
+                    None, 0),
                   ('RAWCOL', cx_Oracle.BINARY, 30, 30, None, None, 0),
-                  ('FIXEDCHARCOL', cx_Oracle.FIXED_CHAR, 40, 160, None, None,
-                        0),
-                  ('NULLABLECOL', cx_Oracle.STRING, 50, 200, None, None, 1) ])
+                  ('FIXEDCHARCOL', cx_Oracle.FIXED_CHAR, 40, 40 * CS_RATIO,
+                    None, None, 0),
+                  ('NULLABLECOL', cx_Oracle.STRING, 50, 50 * CS_RATIO, None,
+                    None, 1) ])
 
     def testFetchAll(self):
         "test that fetching all of the data returns the correct results"

test/StringVar.py

@@ -82,6 +82,17 @@ def tearDown(self):
         del self.connection
 
 
+# determine character set ratio in use in order to determine the buffer size
+# that will be reported in cursor.description; this depends on the database
+# character set and the client character set
+connection = cx_Oracle.connect(TestEnv.USERNAME, TestEnv.PASSWORD,
+        TestEnv.TNSENTRY, encoding = TestEnv.ENCODING,
+        nencoding = TestEnv.NENCODING)
+cursor = connection.cursor()
+cursor.execute("select 'X' from dual")
+col, = cursor.description
+csratio = col[3]
+
 loader = unittest.TestLoader()
 runner = unittest.TextTestRunner(verbosity = 2)
 failures = []
@@ -98,6 +109,7 @@ def tearDown(self):
     setattr(module, "ENCODING", TestEnv.ENCODING)
     setattr(module, "NENCODING", TestEnv.NENCODING)
     setattr(module, "ARRAY_SIZE", TestEnv.ARRAY_SIZE)
+    setattr(module, "CS_RATIO", csratio)
     setattr(module, "TestCase", unittest.TestCase)
     setattr(module, "BaseTestCase", BaseTestCase)
     setattr(module, "cx_Oracle", cx_Oracle)

test/test.py

@@ -23,7 +23,8 @@ def testBindCursor(self):
                 end;""",
                 cursor = cursor)
         self.assertEqual(cursor.description,
-                [ ('STRINGVALUE', cx_Oracle.FIXED_CHAR, 1, 4, None, None, 1) ])
+                [ ('STRINGVALUE', cx_Oracle.FIXED_CHAR, 1, CS_RATIO, None,
+                    None, 1) ])
         self.assertEqual(cursor.fetchall(), [('X',)])
 
     def testBindCursorInPackage(self):
@@ -33,7 +34,8 @@ def testBindCursorInPackage(self):
         self.cursor.callproc(u"pkg_TestOutCursors.TestOutCursor", (2, cursor))
         self.assertEqual(cursor.description,
                 [ ('INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
-                  ('STRINGCOL', cx_Oracle.STRING, 20, 80, None, None, 0) ])
+                  ('STRINGCOL', cx_Oracle.STRING, 20, 20 * CS_RATIO, None,
+                    None, 0) ])
         self.assertEqual(cursor.fetchall(),
                 [ (1, 'String 1'), (2, 'String 2') ])
 

test/uCursorVar.py

@@ -228,11 +228,13 @@ def testCursorDescription(self):
         self.cursor.execute(u"select * from TestStrings")
         self.assertEqual(self.cursor.description,
                 [ (u'INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
-                  (u'STRINGCOL', cx_Oracle.STRING, 20, 80, None, None, 0),
+                  (u'STRINGCOL', cx_Oracle.STRING, 20, 20 * CS_RATIO, None,
+                        None, 0),
                   (u'RAWCOL', cx_Oracle.BINARY, 30, 30, None, None, 0),
-                  (u'FIXEDCHARCOL', cx_Oracle.FIXED_CHAR, 40, 160, None, None,
-                        0),
-                  (u'NULLABLECOL', cx_Oracle.STRING, 50, 200, None, None, 1) ])
+                  (u'FIXEDCHARCOL', cx_Oracle.FIXED_CHAR, 40, 40 * CS_RATIO,
+                        None, None, 0),
+                  (u'NULLABLECOL', cx_Oracle.STRING, 50, 50 * CS_RATIO, None,
+                        None, 1) ])
 
     def testFetchAll(self):
         "test that fetching all of the data returns the correct results"