Correct the handling of ANSI types REAL and DOUBLE PRECISION as implemented by

anthony-tuininga · anthony-tuininga · commit e15851220b00 · 2018-03-21T11:46:17.000-06:00
Oracle. These types are just subtypes of NUMBER and are not actually stored as native floating point numbers. Native floating point numbers are used with Oracle types BINARY_FLOAT and BINARY_DOUBLE (oracle#163).
diff --git a/odpi b/odpi
@@ -1 +1 @@
-Subproject commit f4e845c52c4102b406128c12ab434ac4d44aec68
+Subproject commit 1136e4751571e6f5ccea93e321b169a6899409ec
diff --git a/test/ObjectVar.py b/test/ObjectVar.py
@@ -123,7 +123,7 @@ def testFetchData(self):
                   ('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     ', 'N First Row',
-                'N First   ', 2, 5, 12.5, 25.25, 50.125,
+                'N First   ', 2, 5, 12.125, 0.5, 12.5, 25.25, 50.125,
                 cx_Oracle.Timestamp(2007, 3, 6, 0, 0, 0),
                 cx_Oracle.Timestamp(2008, 9, 12, 16, 40),
                 cx_Oracle.Timestamp(2009, 10, 13, 17, 50),
@@ -134,7 +134,7 @@ def testFetchData(self):
                 [5, 10, None, 20])
         self.__TestData(2, None, [3, None, 9, 12, 15])
         self.__TestData(3, (3, 'Third row', 'Third     ', 'N Third Row',
-                'N Third   ', 4, 10, 43.25, 86.5, 192.125,
+                'N Third   ', 4, 10, 6.5, 0.75, 43.25, 86.5, 192.125,
                 cx_Oracle.Timestamp(2007, 6, 21, 0, 0, 0),
                 cx_Oracle.Timestamp(2007, 12, 13, 7, 30, 45),
                 cx_Oracle.Timestamp(2017, 6, 21, 23, 18, 45),
@@ -153,7 +153,8 @@ def testGetObjectType(self):
         self.assertEqual(typeObj.name, "UDT_OBJECT")
         expectedAttributeNames = ["NUMBERVALUE", "STRINGVALUE",
                 "FIXEDCHARVALUE", "NSTRINGVALUE", "NFIXEDCHARVALUE",
-                "INTVALUE", "SMALLINTVALUE", "FLOATVALUE", "BINARYFLOATVALUE",
+                "INTVALUE", "SMALLINTVALUE", "REALVALUE",
+                "DOUBLEPRECISIONVALUE", "FLOATVALUE", "BINARYFLOATVALUE",
                 "BINARYDOUBLEVALUE", "DATEVALUE", "TIMESTAMPVALUE",
                 "TIMESTAMPTZVALUE", "TIMESTAMPLTZVALUE", "CLOBVALUE",
                 "NCLOBVALUE", "BLOBVALUE", "SUBOBJECTVALUE", "SUBOBJECTARRAY"]
@@ -203,6 +204,8 @@ def testRoundTripObject(self):
         obj.NFIXEDCHARVALUE = "Fixed N"
         obj.INTVALUE = 27
         obj.SMALLINTVALUE = 13
+        obj.REALVALUE = 184.875
+        obj.DOUBLEPRECISIONVALUE = 1.375
         obj.FLOATVALUE = 23.75
         obj.DATEVALUE = datetime.date(2017, 5, 9)
         obj.TIMESTAMPVALUE = datetime.datetime(2017, 5, 9, 9, 41, 13)
@@ -225,7 +228,7 @@ def testRoundTripObject(self):
                 from TestObjects
                 where IntCol = 4""")
         self.__TestData(4, (5, 'A string', 'Fixed str ', 'A NCHAR string',
-                'Fixed N   ', 27, 13, 23.75, 14.25, 29.1625,
+                'Fixed N   ', 27, 13, 184.875, 1.375, 23.75, 14.25, 29.1625,
                 cx_Oracle.Timestamp(2017, 5, 9, 0, 0, 0),
                 cx_Oracle.Timestamp(2017, 5, 9, 9, 41, 13),
                 cx_Oracle.Timestamp(1986, 8, 2, 15, 27, 38),
diff --git a/test/sql/SetupTest.sql b/test/sql/SetupTest.sql
@@ -66,6 +66,8 @@ create type &main_user..udt_Object as object (
     NFixedCharValue                     nchar(10),
     IntValue                            integer,
     SmallIntValue                       smallint,
+    RealValue                           real,
+    DoublePrecisionValue                double precision,
     FloatValue                          float,
     BinaryFloatValue                    binary_float,
     BinaryDoubleValue                   binary_double,
@@ -321,7 +323,7 @@ end;
 
 insert into &main_user..TestObjects values (1,
     &main_user..udt_Object(1, 'First row', 'First', 'N First Row', 'N First',
-        2, 5, 12.5, 25.25, 50.125, to_date(20070306, 'YYYYMMDD'),
+        2, 5, 12.125, 0.5, 12.5, 25.25, 50.125, to_date(20070306, 'YYYYMMDD'),
         to_timestamp('20080912 16:40:00', 'YYYYMMDD HH24:MI:SS'),
         to_timestamp_tz('20091013 17:50:00 00:00',
                 'YYYYMMDD HH24:MI:SS TZH:TZM'),
@@ -340,7 +342,7 @@ insert into &main_user..TestObjects values (2, null,
 
 insert into &main_user..TestObjects values (3,
     &main_user..udt_Object(3, 'Third row', 'Third', 'N Third Row', 'N Third',
-        4, 10, 43.25, 86.5, 192.125, to_date(20070621, 'YYYYMMDD'),
+        4, 10, 6.5, 0.75, 43.25, 86.5, 192.125, to_date(20070621, 'YYYYMMDD'),
         to_timestamp('20071213 07:30:45', 'YYYYMMDD HH24:MI:SS'),
         to_timestamp_tz('20170621 23:18:45 00:00',
                 'YYYYMMDD HH24:MI:SS TZH:TZM'),
