hydrate inner values (#49)

Author: Jeseeq

README.md

@@ -562,6 +562,7 @@ const statement = await connection.execute("select 1 union all select 2");
 
 const { data } = await statement.streamResult();
 
+
 data.pipe(serializedStream).pipe(process.stdout);
 ```
 

src/statement/dataTypes.ts

@@ -87,13 +87,31 @@ export const getFireboltType = (type: string): string => {
   const match = key.match(COMPLEX_TYPE);
   if (match) {
     const [_, outerType, innerType] = match;
+    if (innerType.match(COMPLEX_TYPE)) {
+      return getFireboltType(innerType);
+    }
     const mappedType = getMappedType(innerType);
     return mappedType ? `${outerType}(${mappedType})` : key;
   }
   const mappedType = getMappedType(key);
   return mappedType || key;
 };
 
+export const getInnerType = (type: string): string => {
+  const key = type.toLowerCase();
+  const match = key.match(COMPLEX_TYPE);
+  if (match) {
+    const [_, _outerType, innerType] = match;
+    if (innerType.match(COMPLEX_TYPE)) {
+      return getInnerType(innerType);
+    }
+    const mappedType = getMappedType(innerType);
+    return mappedType || innerType;
+  }
+  const mappedType = getMappedType(key);
+  return mappedType || key;
+};
+
 export const isByteAType = (type: string) => {
   return BYTEA_TYPES.indexOf(type) !== -1;
 };

src/statement/hydrateResponse.ts

@@ -1,15 +1,25 @@
 import BigNumber from "bignumber.js";
 import { ExecuteQueryOptions, Row } from "../types";
 import { Meta } from "../meta";
-import { isByteAType, isDateType, isNumberType } from "./dataTypes";
+import {
+  isByteAType,
+  isDateType,
+  isNumberType,
+  getInnerType
+} from "./dataTypes";
 import { hydrateDate } from "./hydrateDate";
 
 const getHydratedValue = (
   value: unknown,
-  meta: Meta,
+  type: string,
   executeQueryOptions: ExecuteQueryOptions
-) => {
-  const { type } = meta;
+): any => {
+  if (Array.isArray(value)) {
+    const innerType = getInnerType(type);
+    return value.map(element =>
+      getHydratedValue(element, innerType, executeQueryOptions)
+    );
+  }
   if (isDateType(type)) {
     return value ? hydrateDate(value as string) : value;
   }
@@ -44,14 +54,14 @@ export const hydrateRow = (
       const key = +index;
       (hydratedRow as unknown[])[key] = getHydratedValue(
         row[key],
-        column,
+        column.type,
         executeQueryOptions
       );
     } else {
       const key = column.name;
       (hydratedRow as Record<string, unknown>)[key] = getHydratedValue(
         row[key],
-        column,
+        column.type,
         executeQueryOptions
       );
     }

test/integration/outputFormat.test.ts

@@ -36,4 +36,26 @@ describe("integration test", () => {
     expect(long_type.type).toEqual("long");
     expect(array_type.type).toEqual("array(int)");
   });
+  it("hydrates arrays", async () => {
+    const firebolt = Firebolt({
+      apiEndpoint: process.env.FIREBOLT_API_ENDPOINT as string
+    });
+
+    const connection = await firebolt.connect(connectionParams);
+
+    const statement = await connection.execute(
+      `select
+'2023-06-20 14:50:00'::TIMESTAMPNTZ as ts,
+['2023-06-20 14:50:00'::TIMESTAMPNTZ] as ts_array,
+['2023-06-20 14:50:00'::TIMESTAMPNTZ, NULL] as nullable_ts_array;`
+    );
+
+    const { data, meta } = await statement.fetchResult();
+    expect(data.length).toEqual(1);
+    const row = data[0];
+    const [ts, ts_array, nullable_ts_array] = row as unknown[];
+    expect(ts instanceof Date).toEqual(true);
+    expect((ts_array as unknown[])[0] instanceof Date).toEqual(true);
+    expect((nullable_ts_array as unknown[])[0] instanceof Date).toEqual(true);
+  });
 });