triangle-utils 1.4.132 → 1.4.134

package/dist/src/UtilsRDS.d.ts

@@ -1,18 +1,14 @@
-import { Client } from "pg";
 export declare class UtilsRDS {
     private readonly postgres;
-    private is_connected;
     private readonly rds_data;
     private readonly rds_cluster_arn;
     private readonly rds_secret_arn;
     constructor(region: string, rds_cluster_arn: string, rds_secret_arn: string, rds_host: string, rds_username: string, rds_password: string);
-    connect(): Promise<Client | undefined>;
+    connect(): Promise<void>;
     disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;
-    }): Promise<{
-        [k: string]: unknown;
-    }[]>;
+    }): Promise<any[]>;
     exec(sql: string, options?: {
         is_verbose?: boolean;
     }): Promise<any[]>;

package/dist/src/UtilsRDS.js

@@ -20,14 +20,27 @@ function convert_rds_input(input) {
     }
     return "NULL";
 }
+function convert_rds_output(input) {
+    if (input.isNull) {
+        return undefined;
+    }
+    else if (input.stringValue !== undefined) {
+        return input.stringValue;
+    }
+    else if (input.longValue !== undefined) {
+        return input.longValue;
+    }
+    else if (input.booleanValue !== undefined) {
+        return input.booleanValue;
+    }
+    return undefined;
+}
 export class UtilsRDS {
     postgres;
-    is_connected;
     rds_data;
     rds_cluster_arn;
     rds_secret_arn;
     constructor(region, rds_cluster_arn, rds_secret_arn, rds_host, rds_username, rds_password) {
-        this.is_connected = false;
         this.postgres = new Client({
             host: rds_host,
             user: rds_username,
@@ -43,29 +56,19 @@ export class UtilsRDS {
             this.rds_secret_arn = rds_secret_arn;
     }
     async connect() {
-        if (this.is_connected) {
-            return;
-        }
-        this.is_connected = true;
-        return await this.postgres.connect();
+        await this.postgres.connect();
     }
     async disconnect() {
         await this.postgres.end();
-        this.is_connected = false;
     }
     async query(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
         if (is_verbose) {
             console.log(sql);
         }
-        if (!this.is_connected) {
-            const response_connect = await this.connect();
-            if (is_verbose) {
-                console.log(response_connect);
-            }
-        }
         const response = await this.postgres.query(sql);
-        return response.rows.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)));
+        return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
+            .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)));
     }
     async exec(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
@@ -78,10 +81,16 @@ export class UtilsRDS {
                 secretArn: this.rds_secret_arn,
                 database: "postgres",
                 sql: sql,
-                formatRecordsAs: "JSON"
+                includeResultMetadata: true
             })
-                .then(response => JSON.parse(response.formattedRecords || "[]"))
-                .then(items => items.map((item) => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null))))
+                // .then(response => {
+                //     console.log(response)
+                //     return response
+                // })
+                .then(response => (response.records || [])
+                .map((item) => Object.fromEntries((response.columnMetadata || [])
+                .map((column, i) => [column.name || "", column.typeName === "numeric" ? Number(convert_rds_output(item[i])) : convert_rds_output(item[i])])
+                .filter(([key, value]) => value !== null))))
             :
                 await this.query(sql, options);
         if (!Array.isArray(items)) {

package/dist/src/f.js

@@ -67,5 +67,7 @@ const utils = new TriangleUtils(config);
 //     }, { is_verbose : true })
 //     console.log(response)
 // }
-const lal_file_voters = await utils.rds.query("SELECT * FROM lal_file_voters LIMIT 3;");
+await utils.rds.connect();
+const lal_file_voters = await utils.rds.query("SELECT lal_file_voter_id, address_residence_city, address_residence_latitude, address_residence_longitude, address_residence_property_sqft FROM lal_file_voters LIMIT 3;");
 console.log(lal_file_voters);
+await utils.rds.disconnect();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.132",
+    "version": "1.4.134",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsRDS.ts

@@ -18,10 +18,22 @@ function convert_rds_input(input : string | boolean | number | Record<string, an
     return "NULL"
 }
 
+function convert_rds_output(input : Field) {
+    if (input.isNull) {
+        return undefined
+    } else if (input.stringValue !== undefined) {
+        return input.stringValue
+    } else if (input.longValue !== undefined) {
+        return input.longValue
+    } else if (input.booleanValue !== undefined) {
+        return input.booleanValue
+    }
+    return undefined
+}
+
 export class UtilsRDS {
 
     private readonly postgres : Client
-    private is_connected : boolean
     private readonly rds_data : RDSData
     private readonly rds_cluster_arn : string
     private readonly rds_secret_arn : string
@@ -34,7 +46,6 @@ export class UtilsRDS {
         rds_username : string,
         rds_password : string
     ) {
-        this.is_connected = false
         this.postgres = new Client({
             host : rds_host,
             user : rds_username,
@@ -51,16 +62,11 @@ export class UtilsRDS {
     }
 
     async connect() {
-        if (this.is_connected) {
-            return
-        }
-        this.is_connected = true
-        return await this.postgres.connect()
+        await this.postgres.connect()
     }
 
     async disconnect() {
         await this.postgres.end()
-        this.is_connected = false
     }
 
     async query(
@@ -73,14 +79,11 @@ export class UtilsRDS {
         if (is_verbose) {
             console.log(sql)
         }
-        if (!this.is_connected) {
-            const response_connect = await this.connect()
-            if (is_verbose) {
-                console.log(response_connect)
-            }
-        }
         const response = await this.postgres.query(sql)
-        return response.rows.map(item => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null)))
+        return response.rows.map(item => Object.fromEntries(
+            response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
+                .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)
+        ))
     }
 
     async exec(
@@ -99,10 +102,18 @@ export class UtilsRDS {
                 secretArn : this.rds_secret_arn,
                 database : "postgres",
                 sql : sql,
-                formatRecordsAs : "JSON"
+                includeResultMetadata : true
             })
-                .then(response => JSON.parse(response.formattedRecords || "[]"))
-                .then(items => items.map((item : any) => Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== null))))
+                // .then(response => {
+                //     console.log(response)
+                //     return response
+                // })
+                .then(response => (response.records || [])
+                    .map((item : any) => Object.fromEntries((response.columnMetadata || [])
+                        .map((column, i) => [column.name || "", column.typeName === "numeric" ? Number(convert_rds_output(item[i])) : convert_rds_output(item[i])])
+                        .filter(([key, value]) => value !== null)
+                    ))
+                )
         :
             await this.query(sql, options)
         if (!Array.isArray(items)) {

package/src/f.ts

@@ -84,5 +84,7 @@ const utils = new TriangleUtils(config)
 //     console.log(response)
 // }
 
-const lal_file_voters = await utils.rds.query("SELECT * FROM lal_file_voters LIMIT 3;")
-    console.log(lal_file_voters)
+await utils.rds.connect()
+const lal_file_voters = await utils.rds.query("SELECT lal_file_voter_id, address_residence_city, address_residence_latitude, address_residence_longitude, address_residence_property_sqft FROM lal_file_voters LIMIT 3;")
+    console.log(lal_file_voters)
+await utils.rds.disconnect()