Attribute and element values of DbObject instances that are numbers are

now returned as integers if the precision and scale allow for it -- in
the same way that numbers are fetched from the database (#99).

Author: anthony-tuininga

doc/src/release_notes.rst

@@ -49,6 +49,10 @@ Common Changes
     :data:`FetchInfo.type_code` for data of this type was
     :data:`~oracledb.DB_TYPE_LONG` in Thick mode and
     :data:`~oracledb.DB_TYPE_OBJECT` in Thin mode.
+#)  Attribute and element values of DbObject instances that are numbers are now
+    returned as integers if the precision and scale allow for it -- in the same
+    way that numbers are fetched from the database
+    (`issue 99 <https://github.com/oracle/python-oracledb/issues/99>`__).
 #)  Added support for parsing the ``FAILOVER`` clause in full connect
     descriptors.
 #)  Fixed bug with getting unknown attributes from DbObject instances.

src/oracledb/base_impl.pxd

@@ -379,13 +379,15 @@ cdef class BaseDbObjectTypeImpl:
         readonly DbType element_dbtype
         readonly BaseDbObjectTypeImpl element_objtype
         readonly BaseConnImpl _conn_impl
+        int _element_preferred_num_type
 
 
 cdef class BaseDbObjectAttrImpl:
     cdef:
         readonly str name
         readonly DbType dbtype
         readonly BaseDbObjectTypeImpl objtype
+        int _preferred_num_type
 
 
 cdef class BaseDbObjectImpl:
@@ -474,3 +476,4 @@ cdef class BindVar:
                            bint defer_type_assignment) except -1
 
 cdef object get_exception_class(int32_t code)
+cdef int get_preferred_num_type(int16_t precision, int8_t scale)

src/oracledb/base_impl.pyx

@@ -140,6 +140,12 @@ cdef object get_exception_class(int32_t code):
     return exceptions.DatabaseError
 
 
+cdef int get_preferred_num_type(int16_t precision, int8_t scale):
+    if scale == 0 or (scale == -127 and precision == 0):
+        return NUM_TYPE_INT
+    return NUM_TYPE_FLOAT
+
+
 include "impl/base/utils.pyx"
 include "impl/base/connect_params.pyx"
 include "impl/base/pool_params.pyx"

src/oracledb/impl/thick/dbobject.pyx

@@ -116,7 +116,8 @@ cdef class ThickDbObjectImpl(BaseDbObjectImpl):
         type_impl = self.type
         try:
             return _convert_to_python(type_impl._conn_impl, attr.dbtype,
-                                      attr.objtype, &data.value)
+                                      attr.objtype, &data.value,
+                                      attr._preferred_num_type)
         finally:
             if attr.objtype is not None:
                 dpiObject_release(data.value.asObject)
@@ -145,7 +146,8 @@ cdef class ThickDbObjectImpl(BaseDbObjectImpl):
         try:
             return _convert_to_python(objtype._conn_impl,
                                       objtype.element_dbtype,
-                                      objtype.element_objtype, &data.value)
+                                      objtype.element_objtype, &data.value,
+                                      objtype._element_preferred_num_type)
         finally:
             if objtype.element_objtype is not None:
                 dpiObject_release(data.value.asObject)
@@ -285,6 +287,9 @@ cdef class ThickDbObjectAttrImpl(BaseDbObjectAttrImpl):
             _raise_from_odpi()
         impl.name = info.name[:info.nameLength].decode()
         impl.dbtype = DbType._from_num(info.typeInfo.oracleTypeNum)
+        impl._preferred_num_type = \
+                get_preferred_num_type(info.typeInfo.precision,
+                                       info.typeInfo.scale)
         if info.typeInfo.objectType:
             typ_handle = info.typeInfo.objectType
             impl.objtype = ThickDbObjectTypeImpl._from_handle(conn_impl,
@@ -333,6 +338,9 @@ cdef class ThickDbObjectTypeImpl(BaseDbObjectTypeImpl):
         if impl.is_collection:
             dbtype = DbType._from_num(info.elementTypeInfo.oracleTypeNum)
             impl.element_dbtype = dbtype
+            impl._element_preferred_num_type = \
+                get_preferred_num_type(info.elementTypeInfo.precision,
+                                       info.elementTypeInfo.scale)
             if info.elementTypeInfo.objectType != NULL:
                 handle = info.elementTypeInfo.objectType
                 temp = ThickDbObjectTypeImpl._from_handle(conn_impl, handle)

src/oracledb/impl/thin/constants.pxi

@@ -473,6 +473,10 @@ cdef enum:
     TNS_OBJ_TDS_TYPE_BLOB = 30
     TNS_OBJ_TDS_TYPE_TIMESTAMP_LTZ = 33
     TNS_OBJ_TDS_TYPE_BINARY_FLOAT = 37
+    TNS_OBJ_TDS_TYPE_START_EMBED_ADT = 39
+    TNS_OBJ_TDS_TYPE_END_EMBED_ADT = 40
+    TNS_OBJ_TDS_TYPE_SUBTYPE_MARKER = 43
+    TNS_OBJ_TDS_TYPE_EMBED_ADT_INFO = 44
     TNS_OBJ_TDS_TYPE_BINARY_DOUBLE = 45
 
 # xml type constants