Added support for smallint and float data types in Oracle objects, as requested

anthony-tuininga · anthony-tuininga · commit 543b22f31ec2 · 2017-04-04T22:00:29.000-06:00
(#4).
diff --git a/doc/src/releasenotes.rst b/doc/src/releasenotes.rst
@@ -8,6 +8,12 @@ Release notes
 Version 5.next
 --------------
 
+Version 5.3.1 (TBD)
+-------------------
+
+1) Added support for smallint and float data types in Oracle objects, as
+   requested (https://github.com/oracle/python-cx_Oracle/issues/4).
+
 
 Version 5.3 (March 2017)
 ------------------------
diff --git a/src/Object.c b/src/Object.c
@@ -425,9 +425,11 @@ static PyObject *Object_ConvertToPython(
             return cxString_FromEncodedString( (char*) stringValue,
                     stringSize, environment->encoding);
         case OCI_TYPECODE_INTEGER:
+        case OCI_TYPECODE_SMALLINT:
             return OracleNumberToPythonInteger(environment,
                     (OCINumber*) value);
         case OCI_TYPECODE_NUMBER:
+        case OCI_TYPECODE_FLOAT:
             return OracleNumberToPythonFloat(environment, (OCINumber*) value);
         case OCI_TYPECODE_DATE:
             return OracleDateToPythonDate(&vt_DateTime, (OCIDate*) value);
diff --git a/test/ObjectVar.py b/test/ObjectVar.py
@@ -111,14 +111,14 @@ def testFetchData(self):
                 [ ('INTCOL', cx_Oracle.NUMBER, 10, None, 9, 0, 0),
                   ('OBJECTCOL', cx_Oracle.OBJECT, None, None, None, None, 1),
                   ('ARRAYCOL', cx_Oracle.OBJECT, None, None, None, None, 1) ])
-        self.__TestData(1, (1, 'First row', 'First     ',
+        self.__TestData(1, (1, 'First row', 'First     ', 2, 5, 12.5,
                 cx_Oracle.Timestamp(2007, 3, 6, 0, 0, 0),
                 cx_Oracle.Timestamp(2008, 9, 12, 16, 40),
                 (11, 'Sub object 1'),
                 [(5, 'first element'), (6, 'second element')]),
                 [5, 10, None, 20])
         self.__TestData(2, None, [3, None, 9, 12, 15])
-        self.__TestData(3, (3, 'Third row', 'Third     ',
+        self.__TestData(3, (3, 'Third row', 'Third     ', 4, 10, 43.25,
                 cx_Oracle.Timestamp(2007, 6, 21, 0, 0, 0),
                 cx_Oracle.Timestamp(2007, 12, 13, 7, 30, 45),
                 (13, 'Sub object 3'),
@@ -132,8 +132,9 @@ def testGetObjectType(self):
         self.assertEqual(typeObj.schema, self.connection.username.upper())
         self.assertEqual(typeObj.name, "UDT_OBJECT")
         expectedAttributeNames = ["NUMBERVALUE", "STRINGVALUE",
-                "FIXEDCHARVALUE", "DATEVALUE", "TIMESTAMPVALUE",
-                "SUBOBJECTVALUE", "SUBOBJECTARRAY"]
+                "FIXEDCHARVALUE", "INTVALUE", "SMALLINTVALUE", "FLOATVALUE",
+                "DATEVALUE", "TIMESTAMPVALUE", "SUBOBJECTVALUE",
+                "SUBOBJECTARRAY"]
         actualAttributeNames = [a.name for a in typeObj.attributes]
         self.assertEqual(actualAttributeNames, expectedAttributeNames)
         typeObj = self.connection.gettype("UDT_OBJECTARRAY")
diff --git a/test/SetupTest.sql b/test/SetupTest.sql
@@ -56,6 +56,9 @@ create type cx_Oracle.udt_Object as object (
   NumberValue           number,
   StringValue           varchar2(60),
   FixedCharValue        char(10),
+  IntValue              integer,
+  SmallIntValue         smallint,
+  FloatValue            float,
   DateValue             date,
   TimestampValue        timestamp,
   SubObjectValue        cx_Oracle.udt_SubObject,
@@ -272,7 +275,7 @@ end;
 /
 
 insert into cx_Oracle.TestObjects values (1,
-    cx_Oracle.udt_Object(1, 'First row', 'First',
+    cx_Oracle.udt_Object(1, 'First row', 'First', 2, 5, 12.5,
         to_date(20070306, 'YYYYMMDD'),
         to_timestamp('20080912 16:40:00', 'YYYYMMDD HH24:MI:SS'),
         cx_Oracle.udt_SubObject(11, 'Sub object 1'),
@@ -285,7 +288,7 @@ insert into cx_Oracle.TestObjects values (2, null,
     cx_Oracle.udt_Array(3, null, 9, 12, 15));
 
 insert into cx_Oracle.TestObjects values (3,
-    cx_Oracle.udt_Object(3, 'Third row', 'Third',
+    cx_Oracle.udt_Object(3, 'Third row', 'Third', 4, 10, 43.25,
         to_date(20070621, 'YYYYMMDD'),
         to_timestamp('20071213 07:30:45', 'YYYYMMDD HH24:MI:SS'),
         cx_Oracle.udt_SubObject(13, 'Sub object 3'),
