Merge metadata changes derived from PR #386

Author: cjbj

doc/api.md

@@ -107,6 +107,58 @@ function extend(oracledb) {
         value: 0,
         enumerable: true
       },
+      DB_TYPE_VARCHAR: {
+        value: 1,
+        enumerable: true
+      },
+      DB_TYPE_NUMBER: {
+        value: 2,
+        enumerable: true
+      },
+      DB_TYPE_DATE: {
+        value: 12,
+        enumerable: true
+      },
+      DB_TYPE_RAW: {
+        value: 23,
+        enumerable: true
+      },
+      DB_TYPE_CHAR: {
+        value: 96,
+        enumerable: true
+      },
+      DB_TYPE_BINARY_FLOAT: {
+        value: 100,
+        enumerable: true
+      },
+      DB_TYPE_BINARY_DOUBLE: {
+        value: 101,
+        enumerable: true
+      },
+      DB_TYPE_ROWID: {
+        value: 104,
+        enumerable: true
+      },
+      DB_TYPE_CLOB: {
+        value: 112,
+        enumerable: true
+      },
+      DB_TYPE_BLOB: {
+        value: 113,
+        enumerable: true
+      },
+      DB_TYPE_TIMESTAMP: {
+        value: 187,
+        enumerable: true
+      },
+      DB_TYPE_TIMESTAMPTZ: {
+        value: 188,
+        enumerable: true
+      },
+      DB_TYPE_TIMESTAMPLTZ: {
+        value: 232,
+        enumerable: true
+      },
       STRING: {
         value: 2001,
         enumerable: true

lib/oracledb.js

@@ -136,15 +136,20 @@ typedef enum
 #endif
 
 
-typedef struct
+typedef struct MetaData
 {
   unsigned char  *colName;       // column name
   unsigned int    colNameLen;    // length of column name
   unsigned short  dbType;        // database server type
   unsigned short  dbSize;        // size at database
-  unsigned int    precision;     // precision
+  unsigned char   precision;     // precision
   char            scale;         // scale
   unsigned char   isNullable;    // is the column nullable?
+
+  MetaData ()
+    : colName ( NULL ), colNameLen ( 0 ), dbType ( 0 ), dbSize ( 0 ),
+      precision ( 0 ), scale ( 0 ), isNullable ( 0 )
+    {}
 } MetaData;
 
 
@@ -195,7 +200,12 @@ class Stmt
 
   virtual void fetch(unsigned int numRows = 1) = 0;
 
-  virtual const MetaData * getMetaData() = 0;
+
+/*
+ * The returned pointer to MetaData struct should not be freed by the caller
+ * since this will be freed as part of StmtImpl::release()
+ */
+  virtual const MetaData * getMetaData( bool extendedMetaData ) = 0;
 
   virtual unsigned int rowsFetched() const = 0;
 

src/dpi/include/dpiStmt.h

@@ -475,12 +475,18 @@ unsigned int StmtImpl::rowsFetched () const
     obtains column meta data
 
   PARAMETERS
-    -None-
+    extendedMetaData -  true  - all fields are populated
+                        false - only column name, db type, size  is populated.
 
   RETURNS
-    -None-
+    Pointer to MetaData struct.
 */
-const MetaData* StmtImpl::getMetaData ()
+
+/*
+ * The returned pointer to MetaData struct should not be freed by the caller
+ * since this will be freed as part of StmtImpl::release()
+ */
+const MetaData* StmtImpl::getMetaData ( bool extendedMetaData )
 {
 
   if ( !meta_ )
@@ -509,30 +515,53 @@ const MetaData* StmtImpl::getMetaData ()
                            (void*) &(meta_[col].dbType),(ub4 *) 0,
                            (ub4) OCI_ATTR_DATA_TYPE,
                            errh_ ), errh_ );
-        ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
-                           (void*) &(meta_[col].dbSize),(ub4 *) 0,
-                           (ub4) OCI_ATTR_DATA_SIZE,
-                           errh_ ), errh_ );
-        ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
-                           (void*) &(meta_[col].isNullable),(ub4*) 0,
-                           (ub4) OCI_ATTR_IS_NULL,
-                           errh_ ), errh_ );
-        if (meta_[col].dbType == DpiNumber || meta_[col].dbType == DpiBinaryFloat
-               ||meta_[col].dbType == DpiBinaryDouble )
+        switch (  meta_[col].dbType )
+        {
+          case DpiVarChar:
+          case DpiFixedChar:
+          case DpiRaw:
+            // byteSize in case VARCHAR, FIXEDCHAR, RAW columns
+            ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
+                               (void*) &(meta_[col].dbSize),(ub4 *) 0,
+                               (ub4) OCI_ATTR_DATA_SIZE,
+                               errh_ ), errh_ );
+            break;
+
+          default:
+            break;
+        }
+
+        if ( extendedMetaData )
         {
           ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
-                             (void*) &(meta_[col].precision),(ub4* ) 0,
-                             (ub4) OCI_ATTR_PRECISION,
-                             errh_ ), errh_ );
-          ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
-                             (void*) &(meta_[col].scale),(ub4*) 0,
-                             (ub4) OCI_ATTR_SCALE,
+                             (void*) &(meta_[col].isNullable),(ub4*) 0,
+                             (ub4) OCI_ATTR_IS_NULL,
                              errh_ ), errh_ );
-        }
-        else
-        {                           // avoid uninitialized variables
-          meta_[col].precision = 0;
-          meta_[col].scale = 0;
+          switch ( meta_[col].dbType )
+          {
+            case DpiNumber:
+              ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
+                                 (void*) &(meta_[col].precision),(ub4* ) 0,
+                                 (ub4) OCI_ATTR_PRECISION,
+                                 errh_ ), errh_ );
+              ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
+                                 (void*) &(meta_[col].scale),(ub4*) 0,
+                                 (ub4) OCI_ATTR_SCALE,
+                                 errh_ ), errh_ );
+              break;
+
+            case DpiTimestamp:
+            case DpiTimestampTZ:
+            case DpiTimestampLTZ:
+              ociCall(OCIAttrGet(colDesc, (ub4) OCI_DTYPE_PARAM,
+                                 (void*) &(meta_[col].scale),(ub4*) 0,
+                                 (ub4) OCI_ATTR_SCALE,
+                                 errh_ ), errh_ );
+              break;
+
+            default:
+              break;
+          }
         }
 
         OCIDescriptorFree( colDesc, OCI_DTYPE_PARAM);

src/dpi/src/dpiStmtImpl.cpp

@@ -94,7 +94,12 @@ class StmtImpl : public Stmt
                        DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen);
   virtual void fetch (unsigned int numRows = 1);
 
-  virtual const MetaData *getMetaData ();
+
+/*
+ * The returned pointer to MetaData struct should not be freed by the caller
+ * since this will be freed as part of StmtImpl::release()
+ */
+  virtual const MetaData *getMetaData ( bool extendedMetaData );
 
   virtual OCIError *     getError () { return errh_;  }